diff options
| author | Nikita Ioffe <ioffe@google.com> | 2021-07-09 11:42:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-09 11:42:34 +0000 |
| commit | 454d31beffffd910349830f4b232dfdc2dd09dcc (patch) | |
| tree | 572da0f82f719c4f2f99e4e2d4273ad5b3a9108a | |
| parent | 206ad5db6323e268348875daa3c19adf61ef4237 (diff) | |
| parent | 1d2cbb6f50fe3eb2b4281834af4e4bfe8f4097c3 (diff) | |
Merge "Grant INSTALL_PACKAGE_UPDATES permission to Shell" into sc-dev am: 1d2cbb6f50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235316
Change-Id: Ia145803bd4b9db56e12833ec324a77d9fd313bf1
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 6385952fe884..813b7995fe89 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -315,6 +315,7 @@ applications that come with the platform <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/> <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/> <permission name="android.permission.INSTALL_PACKAGES"/> + <permission name="android.permission.INSTALL_PACKAGE_UPDATES"/> <!-- Needed for test only --> <permission name="android.permission.ACCESS_MTP"/> <!-- Needed for test only --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index bc1d420eaa3d..1581e240e1d7 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -161,6 +161,7 @@ <uses-permission android:name="android.permission.READ_INPUT_STATE" /> <uses-permission android:name="android.permission.SET_ORIENTATION" /> <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> + <uses-permission android:name="android.permission.INSTALL_PACKAGE_UPDATES" /> <uses-permission android:name="com.android.permission.USE_INSTALLER_V2" /> <uses-permission android:name="android.permission.INSTALL_TEST_ONLY_PACKAGE" /> <uses-permission android:name="com.android.permission.USE_SYSTEM_DATA_LOADERS" /> |