diff options
| author | 2021-12-16 22:24:49 +0000 | |
|---|---|---|
| committer | 2021-12-16 22:24:49 +0000 | |
| commit | ddb7e2623049d910f897c7a41d4e9e422934fb44 (patch) | |
| tree | 6ed528fe1fbda952cda7fec8ce7a317a6ed4aa77 | |
| parent | f54d7bdb6360d453f9ed2fc0383a007df91bf37c (diff) | |
| parent | 3809e3ee74fa282250c174b68ff2ec38999adac2 (diff) | |
Merge "Add new permission UPDATE_DEVICE_MANAGEMENT_RESOURCES"
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 18d5129cccbd..99e47b1c6b90 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -311,6 +311,7 @@ package android { field public static final String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER"; field public static final String UNLIMITED_SHORTCUTS_API_CALLS = "android.permission.UNLIMITED_SHORTCUTS_API_CALLS"; field public static final String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS"; + field public static final String UPDATE_DEVICE_MANAGEMENT_RESOURCES = "android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES"; field public static final String UPDATE_DOMAIN_VERIFICATION_USER_SELECTION = "android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION"; field public static final String UPDATE_FONTS = "android.permission.UPDATE_FONTS"; field public static final String UPDATE_LOCK = "android.permission.UPDATE_LOCK"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4f35f2c841ea..0eb7c376c37c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6065,6 +6065,12 @@ <permission android:name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP" android:protectionLevel="signature|role" /> + <!-- @SystemApi Allows an application to update certain device management related system + resources. + @hide --> + <permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" + android:protectionLevel="signature|role" /> + <!-- Attribution for Geofencing service. --> <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/> <!-- Attribution for Country Detector. --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index b25e9a18fc3d..a3f07d8fd1b4 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -207,6 +207,7 @@ <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" /> <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" /> + <uses-permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" /> <uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" /> <uses-permission android:name="android.permission.CLEAR_FREEZE_PERIOD" /> <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" /> |