diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
| commit | e002f536cba85cb90655e44e15497054c1a5651a (patch) | |
| tree | 82ced13a5969a87673836a935a0f67d3cf16d5b5 /AndroidManifest.xml | |
| parent | cb079ef38ce9881687ab9c89e1c321ded722c1b3 (diff) | |
| parent | b145bb2c34c495a51b83bf755e560d7b931ea8f7 (diff) | |
| download | android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.gz android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.bz2 android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9120e7ec..3f1bb1d8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,11 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.READ_INSTALL_SESSIONS" /> <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.KILL_UID" /> + <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" /> + <application android:label="@string/app_name" android:allowBackup="false" android:theme="@style/Theme.DialogWhenLarge" @@ -97,8 +100,31 @@ android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS"> <intent-filter> <action android:name="android.intent.action.GET_PERMISSIONS_COUNT" /> + <action android:name="android.intent.action.GET_PERMISSIONS_PACKAGES" /> </intent-filter> </receiver> + + <!-- Wearable Components --> + <service android:name=".wear.WearPackageInstallerService" + android:permission="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" + android:exported="true"> + <intent-filter> + <action android:name="com.android.packageinstaller.wear.INSTALL_PACKAGE"/> + <data android:scheme="content" android:mimeType="vnd.android.cursor.item/*"/> + </intent-filter> + <intent-filter> + <action android:name="com.android.packageinstaller.wear.UNINSTALL_PACKAGE"/> + </intent-filter> + </service> + + <provider android:name=".wear.WearPackageIconProvider" + android:authorities="com.google.android.packageinstaller.wear.provider" + android:grantUriPermissions="true" + android:exported="true" /> + + <activity android:name=".permission.ui.wear.WarningConfirmationActivity" + android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS" + android:theme="@style/Settings"/> </application> </manifest> |