diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-08-07 13:59:43 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2014-08-07 15:23:24 -0700 |
commit | 8538fde237709464ec899a402fee29c0169f6bfa (patch) | |
tree | ef129ecbcd1b4a0d1ee773b7c0fe78b7adc25ab7 /AndroidManifest.xml | |
parent | 0fb1d516cf0b8a6efd29e3fc2f8556a555044c32 (diff) | |
download | android_packages_apps_PackageInstaller-8538fde237709464ec899a402fee29c0169f6bfa.tar.gz android_packages_apps_PackageInstaller-8538fde237709464ec899a402fee29c0169f6bfa.tar.bz2 android_packages_apps_PackageInstaller-8538fde237709464ec899a402fee29c0169f6bfa.zip |
Extend to support install sessions.
Light changes to existing code to support pre-staged install
sessions. Only inspects a base APK from session, which defines all
permissions.
Bug: 16515814
Change-Id: Ia1cb43ff9fdfe1f2468ad0d1374cff2b8eb50f54
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 93ed65d2..66d22542 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -13,10 +13,13 @@ <uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.GRANT_REVOKE_PERMISSIONS" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> + <uses-permission android:name="android.permission.READ_INSTALL_SESSIONS" /> + <application android:label="@string/app_name" android:allowBackup="false" android:theme="@android:style/Theme.DeviceDefault.DialogWhenLarge.NoActionBar" android:supportsRtl="true"> + <activity android:name=".PackageInstallerActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:excludeFromRecents="true"> @@ -33,10 +36,16 @@ <data android:scheme="file" /> <data android:scheme="package" /> </intent-filter> + <intent-filter> + <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> </activity> + <activity android:name=".InstallAppProgress" - android:configChanges="orientation|keyboardHidden|screenSize"> - </activity> + android:configChanges="orientation|keyboardHidden|screenSize" + android:exported="false" /> + <activity android:name=".UninstallerActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:excludeFromRecents="true" @@ -48,25 +57,20 @@ <data android:scheme="package" /> </intent-filter> </activity> + <activity android:name=".UninstallAppProgress" - android:configChanges="orientation|keyboardHidden|screenSize"> - </activity> + android:configChanges="orientation|keyboardHidden|screenSize" + android:exported="false" /> + <activity android:name=".GrantActivity" - android:configChanges="orientation|keyboardHidden|screenSize" - android:excludeFromRecents="true" - android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> + android:configChanges="orientation|keyboardHidden|screenSize" + android:excludeFromRecents="true" + android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> <intent-filter> <action android:name="android.content.pm.action.REQUEST_PERMISSION" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> - <!-- - <receiver android:name=".RemoveReceiver"> - <intent-filter> - <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" /> - <data android:scheme="package" /> - </intent-filter> - </receiver> - --> + </application> </manifest> |