commit 3d833ae5e8367e4b2b5be25936a11e5bba0c7096
author Ted Bauer <tedbauer@google.com> Fri Mar 24 15:34:20 2023 +0000
committer Ted Bauer <tedbauer@google.com> Fri Mar 24 17:00:12 2023 +0000
tree 69608bdef5395e448a79e8148b1fe70782286c24
parent 036b40a7d885f235c11c6c2e52edeae76ab5600b

Rename perm to `WRITE_ALLOWLISTED_DEVICE_CONFIG`.

Bug: 273348535
Test: m
Change-Id: I1d525cbb9faa7ccf64998b855deb0d9865bf850f

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 721b3c4..7f16d5d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2311,7 +2311,7 @@
             @NonNull Set<String> flags) {
         boolean hasAllowlistPermission =
                 context.checkCallingOrSelfPermission(
-                Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG)
+                Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG)
                 == PackageManager.PERMISSION_GRANTED;
         boolean hasWritePermission =
                 context.checkCallingOrSelfPermission(
@@ -2331,7 +2331,7 @@
             }
         } else {
             throw new SecurityException("Permission denial to mutate flag, must have root, "
-                + "WRITE_DEVICE_CONFIG, or ALLOWLISTED_WRITE_DEVICE_CONFIG");
+                + "WRITE_DEVICE_CONFIG, or WRITE_ALLOWLISTED_DEVICE_CONFIG");
         }
     }
 

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 4c48f0e..fedfb43 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -148,7 +148,7 @@
     <uses-permission android:name="android.permission.LOCATION_BYPASS" />
     <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
     <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG" />
+    <uses-permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG" />
     <uses-permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG" />
     <uses-permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />