Revert "Add DeviceConfig permissions to CTS tests."
Revert submission 20961419-deviceconfig-restrict
Reason for revert: CTS breakage
Reverted changes: /q/submissionid:20961419-deviceconfig-restrict
Change-Id: I8bfe65c800bc1b818d13baf32c99b139f4219597
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java
index 621f332..c785568 100644
--- a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java
@@ -765,9 +765,8 @@
public static final String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
/** See {@code Manifest#WRITE_GSERVICES} */
public static final String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";
- /** See {@code Manifest#ALLOWLISTED_WRITE_DEVICE_CONFIG} */
- public static final String ALLOWLISTED_WRITE_DEVICE_CONFIG =
- "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
+ /** See {@code Manifest#WRITE_DEVICE_CONFIG} */
+ public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
/** See {@code Manifest#READ_DEVICE_CONFIG} */
public static final String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";
/** See {@code Manifest#READ_APP_SPECIFIC_LOCALES} */
@@ -1990,4 +1989,4 @@
public static final String MANAGE_DEVICE_POLICY_ACROSS_USERS = "android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS";
/** See {@link Manifest#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} */
public static final String MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL = "android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL";
-}
+}
\ No newline at end of file
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/flags/Flags.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/flags/Flags.java
index 983b8ec..1682e1c6 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/flags/Flags.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/flags/Flags.java
@@ -16,8 +16,8 @@
package com.android.bedstead.nene.flags;
-import static com.android.bedstead.nene.permissions.CommonPermissions.ALLOWLISTED_WRITE_DEVICE_CONFIG;
import static com.android.bedstead.nene.permissions.CommonPermissions.READ_DEVICE_CONFIG;
+import static com.android.bedstead.nene.permissions.CommonPermissions.WRITE_DEVICE_CONFIG;
import android.provider.DeviceConfig;
@@ -79,8 +79,7 @@
* replaced by a bulk update.
*/
public void set(String namespace, String key, @Nullable String value) {
- try (PermissionContext p = TestApis.permissions()
- .withPermission(ALLOWLISTED_WRITE_DEVICE_CONFIG)) {
+ try (PermissionContext p = TestApis.permissions().withPermission(WRITE_DEVICE_CONFIG)) {
DeviceConfig.setProperty(namespace, key, value, /* makeDefault= */ false);
}
}
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/flags/FlagsTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/flags/FlagsTest.java
index f72bf44..859c83a 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/flags/FlagsTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/flags/FlagsTest.java
@@ -16,7 +16,7 @@
package com.android.bedstead.nene.flags;
-import static android.Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import static com.android.bedstead.nene.flags.CommonFlags.DevicePolicyManager.DISABLE_RESOURCES_UPDATABILITY_FLAG;
import static com.android.bedstead.nene.flags.CommonFlags.NAMESPACE_DEVICE_POLICY_MANAGER;
@@ -61,7 +61,7 @@
}
@Test
- @EnsureHasPermission(ALLOWLISTED_WRITE_DEVICE_CONFIG)
+ @EnsureHasPermission(WRITE_DEVICE_CONFIG)
public void setFlagSyncEnabledFalse_bulkFlagUpdateDoesNotChangeValues() throws Exception {
TestApis.flags().setFlagSyncEnabled(false);
TestApis.flags().set(NAMESPACE, KEY, VALUE);
@@ -74,7 +74,7 @@
}
@Test
- @EnsureHasPermission(ALLOWLISTED_WRITE_DEVICE_CONFIG)
+ @EnsureHasPermission(WRITE_DEVICE_CONFIG)
public void setFlagSyncEnabledTrue_bulkFlagUpdateDoesChangeValues() throws Exception {
TestApis.flags().setFlagSyncEnabled(true);
TestApis.flags().set(NAMESPACE, KEY, VALUE);
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
index 80566de..31efed8 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
@@ -38,7 +38,6 @@
field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS";
field public static final String QUERY_AUDIO_STATE = "android.permission.QUERY_AUDIO_STATE";
field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
- field public static final String READ_WRITE_SYNC_DISABLED_MODE_CONFIG = "android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG";
field public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
field public static final String REMAP_MODIFIER_KEYS = "android.permission.REMAP_MODIFIER_KEYS";
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceConfigStateManager.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceConfigStateManager.java
index 9711fd7..859290e 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceConfigStateManager.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceConfigStateManager.java
@@ -60,8 +60,7 @@
public void set(@Nullable String value) {
debug("set", "new value is %s", value);
runWithShellPermissionIdentity(() -> setWithPermissionsGranted(value),
- "android.permission.READ_DEVICE_CONFIG",
- "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG");
+ "android.permission.READ_DEVICE_CONFIG", "android.permission.WRITE_DEVICE_CONFIG");
}
private void setWithPermissionsGranted(@Nullable String value) {
diff --git a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
index 1c82af4..05c4ca7 100644
--- a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
+++ b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
@@ -75,7 +75,7 @@
Manifest.permission.MANAGE_ROLLBACKS,
Manifest.permission.TEST_MANAGE_ROLLBACKS,
Manifest.permission.READ_DEVICE_CONFIG,
- Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG,
+ Manifest.permission.WRITE_DEVICE_CONFIG,
Manifest.permission.FORCE_STOP_PACKAGES,
Manifest.permission.SET_TIME);
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
index e1a19c2..2ac3d78 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
@@ -16,7 +16,7 @@
package android.content.pm.cts;
-import static android.Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -1348,7 +1348,7 @@
}
static void setDeviceProperty(String name, String value) {
- getUiAutomation().adoptShellPermissionIdentity(ALLOWLISTED_WRITE_DEVICE_CONFIG);
+ getUiAutomation().adoptShellPermissionIdentity(WRITE_DEVICE_CONFIG);
try {
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, name, value,
false);
diff --git a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
index e3e1c94..bc1bc8c 100644
--- a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
+++ b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
@@ -45,8 +45,8 @@
private static final String KEY2 = "key2";
private static final String VALUE = "value";
- private static final String ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION =
- "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
+ private static final String WRITE_DEVICE_CONFIG_PERMISSION =
+ "android.permission.WRITE_DEVICE_CONFIG";
private static final String READ_DEVICE_CONFIG_PERMISSION =
"android.permission.READ_DEVICE_CONFIG";
@@ -67,8 +67,8 @@
.dropShellPermissionIdentity();
}
/**
- * Checks that when application does not have READ_DEVICE_CONFIG or
- * ALLOWLISTED_WRITE_DEVICE_CONFIG permissions it cannot access any of DeviceConfig API methods
+ * Checks that when application does not have READ_DEVICE_CONFIG or WRITE_DEVICE_CONFIG
+ * permissions it cannot access any of DeviceConfig API methods
* @throws Exception
*/
@Test
@@ -91,8 +91,8 @@
}
/**
- * Checks that when application has only ALLOWLISTED_WRITE_DEVICE_CONFIG permission
- * it can access only setProperty() methods
+ * Checks that when application has only WRITE_DEVICE_CONFIG permission it can access only
+ * setProperty() methods
* @throws Exception
*/
@Test
@@ -100,7 +100,7 @@
StringBuilder violations = new StringBuilder();
InstrumentationRegistry.getInstrumentation().getUiAutomation()
- .adoptShellPermissionIdentity(ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION);
+ .adoptShellPermissionIdentity(WRITE_DEVICE_CONFIG_PERMISSION);
// setters with write permission
trySetPropertyWithWritePermission(violations);
@@ -145,8 +145,8 @@
}
/**
- * Checks that when application has both READ_DEVICE_CONFIG and ALLOWLISTED_WRITE_DEVICE_CONFIG
- * permissions it can access all methods
+ * Checks that when application has both READ_DEVICE_CONFIG and WRITE_DEVICE_CONFIG permissions
+ * it can access all methods
* @throws Exception
*/
@Test
@@ -155,7 +155,7 @@
InstrumentationRegistry.getInstrumentation().getUiAutomation()
.adoptShellPermissionIdentity(
- ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION,
+ WRITE_DEVICE_CONFIG_PERMISSION,
READ_DEVICE_CONFIG_PERMISSION);
// setters with write permission
@@ -190,7 +190,7 @@
try {
DeviceConfig.setProperty(PUBLIC_NAMESPACE, KEY, VALUE, /*makeDefault=*/ false);
violations.append("DeviceConfig.setProperty() for public namespaces must not be "
- + "accessible without ALLOWLISTED_WRITE_DEVICE_CONFIG permission\n");
+ + "accessible without WRITE_DEVICE_CONFIG permission\n");
} catch (SecurityException e) {
}
@@ -199,7 +199,7 @@
new Properties.Builder(PUBLIC_NAMESPACE).setString(KEY2, VALUE).build();
DeviceConfig.setProperties(properties);
violations.append("DeviceConfig.setProperties() for public namespaces must not be "
- + " accessible without ALLOWLISTED_WRITE_DEVICE_CONFIG permission\n");
+ + " accessible without WRITE_DEVICE_CONFIG permission\n");
} catch (DeviceConfig.BadConfigException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperties() should not throw "
+ "BadConfigException without a known bad configuration", e);
@@ -207,13 +207,13 @@
}
InstrumentationRegistry.getInstrumentation().getUiAutomation()
- .adoptShellPermissionIdentity(ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION);
+ .adoptShellPermissionIdentity(WRITE_DEVICE_CONFIG_PERMISSION);
try {
DeviceConfig.setProperty(PUBLIC_NAMESPACE, KEY, VALUE, /*makeDefault=*/ false);
} catch (SecurityException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperty() must be accessible "
- + "with ALLOWLISTED_WRITE_DEVICE permission", e);
+ + "with WRITE_DEVICE_CONFIG permission", e);
}
try {
@@ -225,7 +225,7 @@
+ "BadConfigException without a known bad configuration", e);
} catch (SecurityException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperties() must be accessible "
- + "with ALLOWLISTED_WRITE_DEVICE permission", e);
+ + "with WRITE_DEVICE_CONFIG permission", e);
}
try {
@@ -271,7 +271,7 @@
try {
DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, /*makeDefault=*/ false);
violations.append("DeviceConfig.setProperty() must not be accessible without "
- + "ALLOWLISTED_WRITE_DEVICE_CONFIG permission.\n");
+ + "WRITE_DEVICE_CONFIG permission.\n");
} catch (SecurityException e) {
}
}
@@ -282,7 +282,7 @@
new Properties.Builder(NAMESPACE2).setString(KEY2, VALUE).build();
DeviceConfig.setProperties(properties);
violations.append("DeviceConfig.setProperties() must not be accessible without "
- + "ALLOWLISTED_WRITE_DEVICE_CONFIG permission.\n");
+ + "WRITE_DEVICE_CONFIG permission.\n");
} catch (DeviceConfig.BadConfigException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperties() should not throw "
+ "BadConfigException without a known bad configuration.", e);
@@ -294,7 +294,7 @@
try {
DeviceConfig.deleteProperty(NAMESPACE, KEY);
violations.append("DeviceConfig.deleteProperty() must not be accessible without "
- + "WRITE_DEVICE_CONFIG_ALLOWLIST permission.\n");
+ + "WRITE_DEVICE_CONFIG permission.\n");
} catch (SecurityException e) {
}
}
@@ -322,7 +322,7 @@
DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, /*makeDefault=*/ false);
} catch (SecurityException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperty() must be accessible "
- + "with ALLOWLISTED_WRITE_DEVICE_CONFIG permission", e);
+ + "with WRITE_DEVICE_CONFIG permission", e);
}
}
@@ -336,7 +336,7 @@
+ " without a known bad configuration.");
} catch (SecurityException e) {
addExceptionToViolations(violations, "DeviceConfig.setProperties() must be accessible "
- + "with ALLOWLISTED_WRITE_DEVICE_CONFIG permission", e);
+ + "with WRITE DEVICE_CONFIG permission", e);
}
}
diff --git a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
index f4cc27f..081f06b 100644
--- a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
+++ b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
@@ -92,15 +92,12 @@
private final Object mLock = new Object();
- private static final String ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION =
- "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
+ private static final String WRITE_DEVICE_CONFIG_PERMISSION =
+ "android.permission.WRITE_DEVICE_CONFIG";
private static final String READ_DEVICE_CONFIG_PERMISSION =
"android.permission.READ_DEVICE_CONFIG";
- private static final String READ_WRITE_SYNC_DISABLED_MODE_CONFIG_PERMISSION =
- "android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG";
-
private static final String MONITOR_DEVICE_CONFIG_ACCESS =
"android.permission.MONITOR_DEVICE_CONFIG_ACCESS";
@@ -123,8 +120,8 @@
}
InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
- ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION, READ_DEVICE_CONFIG_PERMISSION,
- MONITOR_DEVICE_CONFIG_ACCESS, READ_WRITE_SYNC_DISABLED_MODE_CONFIG_PERMISSION);
+ WRITE_DEVICE_CONFIG_PERMISSION, READ_DEVICE_CONFIG_PERMISSION,
+ MONITOR_DEVICE_CONFIG_ACCESS);
}
@Before
@@ -1402,4 +1399,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/tests/permission/src/android/permission/cts/BaseNotificationListenerCheckTest.java b/tests/tests/permission/src/android/permission/cts/BaseNotificationListenerCheckTest.java
index 59683d4..1a2f59c 100644
--- a/tests/tests/permission/src/android/permission/cts/BaseNotificationListenerCheckTest.java
+++ b/tests/tests/permission/src/android/permission/cts/BaseNotificationListenerCheckTest.java
@@ -16,7 +16,7 @@
package android.permission.cts;
-import static android.Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import static android.os.Process.myUserHandle;
import static android.permission.cts.TestUtils.eventually;
@@ -164,7 +164,7 @@
if (!valueWasSet) {
throw new IllegalStateException("Could not set " + propertyName + " to " + value);
}
- }, ALLOWLISTED_WRITE_DEVICE_CONFIG);
+ }, WRITE_DEVICE_CONFIG);
}
/**
diff --git a/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java b/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
index 580938f..65c7dab 100644
--- a/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
+++ b/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
@@ -18,7 +18,7 @@
import static android.Manifest.permission.ACCESS_BACKGROUND_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
-import static android.Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import static android.app.AppOpsManager.OPSTR_FINE_LOCATION;
import static android.app.AppOpsManager.OP_FLAGS_ALL_TRUSTED;
import static android.content.Context.BIND_AUTO_CREATE;
@@ -437,7 +437,7 @@
if (!valueWasSet) {
throw new IllegalStateException("Could not set " + propertyName + " to " + value);
}
- }, ALLOWLISTED_WRITE_DEVICE_CONFIG);
+ }, WRITE_DEVICE_CONFIG);
}
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index f63d328..32294ca 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -4107,16 +4107,6 @@
<permission android:name="android.permission.WRITE_DEVICE_CONFIG"
android:protectionLevel="signature|verifier|configurator"/>
- <!-- @SystemApi @TestApi @hide Allows an application to modify only allowlisted settings.
- <p>Not for use by third-party applications. -->
- <permission android:name="android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG"
- android:protectionLevel="signature|verifier|configurator"/>
-
- <!-- @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.READ_WRITE_SYNC_DISABLED_MODE_CONFIG"
- android:protectionLevel="signature|verifier|configurator"/>
-
<!-- @SystemApi @hide Allows an application to read config settings.
<p>Not for use by third-party applications. -->
<permission android:name="android.permission.READ_DEVICE_CONFIG"
diff --git a/tests/tests/provider/src/android/provider/cts/settings/Settings_ConfigTest.java b/tests/tests/provider/src/android/provider/cts/settings/Settings_ConfigTest.java
index d0a1b2b..1d3418f 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/Settings_ConfigTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/Settings_ConfigTest.java
@@ -91,8 +91,8 @@
private final Object mLock = new Object();
- private static final String ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION =
- "android.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG";
+ private static final String WRITE_DEVICE_CONFIG_PERMISSION =
+ "android.permission.WRITE_DEVICE_CONFIG";
private static final String READ_DEVICE_CONFIG_PERMISSION =
"android.permission.READ_DEVICE_CONFIG";
@@ -100,9 +100,6 @@
private static final String MONITOR_DEVICE_CONFIG_ACCESS =
"android.permission.MONITOR_DEVICE_CONFIG_ACCESS";
- private static final String READ_WRITE_SYNC_DISABLED_MODE_CONFIG =
- "android.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG";
-
private static ContentResolver sContentResolver;
private static Context sContext;
@@ -112,8 +109,8 @@
@Before
public void setUpContext() throws Exception {
InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
- ALLOWLISTED_WRITE_DEVICE_CONFIG_PERMISSION, READ_DEVICE_CONFIG_PERMISSION,
- MONITOR_DEVICE_CONFIG_ACCESS, READ_WRITE_SYNC_DISABLED_MODE_CONFIG);
+ WRITE_DEVICE_CONFIG_PERMISSION, READ_DEVICE_CONFIG_PERMISSION,
+ MONITOR_DEVICE_CONFIG_ACCESS);
sContext = InstrumentationRegistry.getContext();
sContentResolver = sContext.getContentResolver();
}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppClipboardTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppClipboardTest.java
index 500d9fd..5b784fa 100644
--- a/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppClipboardTest.java
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppClipboardTest.java
@@ -18,11 +18,11 @@
import static android.Manifest.permission.ACTIVITY_EMBEDDING;
import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
-import static android.Manifest.permission.ALLOWLISTED_WRITE_DEVICE_CONFIG;
import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
import static android.Manifest.permission.READ_CLIPBOARD_IN_BACKGROUND;
import static android.Manifest.permission.READ_DEVICE_CONFIG;
import static android.Manifest.permission.WAKE_LOCK;
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
@@ -133,7 +133,7 @@
CREATE_VIRTUAL_DEVICE,
READ_CLIPBOARD_IN_BACKGROUND,
READ_DEVICE_CONFIG,
- ALLOWLISTED_WRITE_DEVICE_CONFIG,
+ WRITE_DEVICE_CONFIG,
WRITE_SECURE_SETTINGS,
WAKE_LOCK);
