Merge "Rename perm to `WRITE_ALLOWLISTED_DEVICE_CONFIG`." into udc-dev (6088f17d) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ package android {
		field public static final String ADD_TRUSTED_DISPLAY = "android.permission.ADD_TRUSTED_DISPLAY";
		field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY";
		field public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
		field public static final String ALLOWLISTED_WRITE_DEVICE_CONFIG = "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
		field public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK";
		field public static final String ALLOW_PLACE_IN_MULTI_PANE_SETTINGS = "android.permission.ALLOW_PLACE_IN_MULTI_PANE_SETTINGS";
		field public static final String ALLOW_SLIPPERY_TOUCHES = "android.permission.ALLOW_SLIPPERY_TOUCHES";
		@@ -380,6 +379,7 @@ package android {
		field public static final String WIFI_SET_DEVICE_MOBILITY_STATE = "android.permission.WIFI_SET_DEVICE_MOBILITY_STATE";
		field public static final String WIFI_UPDATE_COEX_UNSAFE_CHANNELS = "android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS";
		field public static final String WIFI_UPDATE_USABILITY_STATS_SCORE = "android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE";
		field public static final String WRITE_ALLOWLISTED_DEVICE_CONFIG = "android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG";
		field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
		field public static final String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE";
		field public static final String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS";

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ package android {
		field public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
		field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY";
		field public static final String ALLOWLISTED_WRITE_DEVICE_CONFIG = "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
		field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";
		field public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";
		field public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission.BIND_CELL_BROADCAST_SERVICE";
		@@ -55,6 +54,7 @@ package android {
		field public static final String TEST_INPUT_METHOD = "android.permission.TEST_INPUT_METHOD";
		field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";
		field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS";
		field public static final String WRITE_ALLOWLISTED_DEVICE_CONFIG = "android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG";
		field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
		field @Deprecated public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
		field public static final String WRITE_OBB = "android.permission.WRITE_OBB";

core/res/AndroidManifest.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -4205,14 +4205,14 @@
		<permission android:name="android.permission.WRITE_DEVICE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @TestApi @hide Allows an application to read/write sync disabled mode config.
		<!-- @SystemApi @TestApi @hide Allows an application to modify only allowlisted settings.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"
		<permission android:name="android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @TestApi @hide Allows an application to modify only allowlisted settings.
		<!-- @SystemApi @TestApi @hide Allows an application to read/write sync disabled mode config.
		<p>Not for use by third-party applications. -->
		<permission android:name="android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG"
		<permission android:name="android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"
		android:protectionLevel="signature\|verifier\|configurator"/>

		<!-- @SystemApi @hide Allows an application to read config settings.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2311,7 +2311,7 @@ public class SettingsProvider extends ContentProvider {
		@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 @@ public class SettingsProvider extends ContentProvider {
		}
		} 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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" />