Merge "Migrate to WRITE_ALLOWLISTED_DEVICE_CONFIG." into udc-dev

2023-04-04 19:39:34 +00:00
parent 5f3a9aa34c 14b7431a87
commit 3248d095e5
8 changed files with 151 additions and 8 deletions
--- a/apct-tests/perftests/settingsprovider/AndroidManifest.xml
+++ b/apct-tests/perftests/settingsprovider/AndroidManifest.xml
@@ -19,7 +19,8 @@

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.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" />

    <application>
        <uses-library android:name="android.test.runner" />
--- a/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/WritableNamespacePrefixes.java
@@ -34,6 +34,142 @@ final class WritableNamespacePrefixes {
            new ArraySet<String>(Arrays.asList(
                "app_compat_overrides",
                "game_overlay",
-                "namespace1"
+                "namespace1",
+                "accessibility",
+                "activity_manager",
+                "activity_manager_native_boot",
+                "adaptive_charging",
+                "adservices",
+                "aiai_controlled_releases",
+                "alarm_manager",
+                "app_cloning",
+                "app_compat",
+                "app_compat_overrides",
+                "app_hibernation",
+                "app_standby",
+                "appsearch",
+                "arc_app_compat",
+                "astrea_controlled_releases",
+                "attention_manager_service",
+                "auto_pin_confirmation",
+                "autofill",
+                "backup_and_restore",
+                "base",
+                "battery_saver",
+                "biometrics",
+                "bluetooth",
+                "bluetooth_native",
+                "camera_native",
+                "captive_portal_login",
+                "car",
+                "cellular_security",
+                "clipboard",
+                "codegen_feature_flag_extractor",
+                "companion",
+                "configuration",
+                "connectivity",
+                "connectivity_thermal_power_manager",
+                "constrain_display_apis",
+                "content_capture",
+                "credential_manager",
+                "device_idle",
+                "device_personalization_services",
+                "device_policy_manager",
+                "devicelock",
+                "display_manager",
+                "dropbox",
+                "edgetpu_native",
+                "exo",
+                "flipendo",
+                "game_driver",
+                "game_overlay",
+                "gantry",
+                "halyard_demo",
+                "haptics",
+                "hdmi_control",
+                "health_fitness",
+                "input",
+                "input_method",
+                "input_native",
+                "input_native_boot",
+                "intelligence_bubbles",
+                "interaction_jank_monitor",
+                "ipsec",
+                "jobscheduler",
+                "kiwi",
+                "latency_tracker",
+                "launcher",
+                "launcher_lily",
+                "leaked_animator",
+                "lmkd_native",
+                "location",
+                "logcat_manager",
+                "low_power_standby",
+                "media",
+                "media_better_together",
+                "media_native",
+                "memory_safety_native",
+                "memory_safety_native_boot",
+                "mglru_native",
+                "nearby",
+                "netd_native",
+                "nnapi_native",
+                "notification_assistant",
+                "odad",
+                "on_device_abuse",
+                "on_device_personalization",
+                "oslo",
+                "ota",
+                "package_manager_service",
+                "permissions",
+                "privacy",
+                "private_compute_services",
+                "profcollect_native_boot",
+                "remote_auth",
+                "remote_key_provisioning_native",
+                "rollback",
+                "rollback_boot",
+                "rotation_resolver",
+                "runtime",
+                "runtime_native",
+                "runtime_native_boot",
+                "sdk_sandbox",
+                "settings_stats",
+                "shared",
+                "shared_native",
+                "shared_native_boot",
+                "statsd_java",
+                "statsd_java_boot",
+                "statsd_native",
+                "statsd_native_boot",
+                "storage_native_boot",
+                "surface_flinger_native_boot",
+                "swcodec_native",
+                "system_scheduler",
+                "system_server_watchdog",
+                "system_time",
+                "systemui",
+                "tare",
+                "telephony",
+                "testing",
+                "tethering",
+                "text",
+                "textclassifier",
+                "touchflow_native",
+                "tv_hdr_output_control",
+                "twoshay_native",
+                "uwb",
+                "vcn",
+                "vendor_system_native",
+                "vendor_system_native_boot",
+                "virtualization_framework_native",
+                "vpn",
+                "wallpaper_content",
+                "wear",
+                "wearable_sensing",
+                "widget",
+                "wifi",
+                "window_manager",
+                "window_manager_native_boot"
            ));
 }
--- a/packages/SettingsProvider/test/AndroidManifest.xml
+++ b/packages/SettingsProvider/test/AndroidManifest.xml
@@ -20,7 +20,8 @@
    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-    <uses-permission android:name="android.permission.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.READ_DEVICE_CONFIG"/>
    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
--- a/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml
+++ b/services/tests/PackageManagerServiceTests/server/AndroidManifest.xml
@@ -75,7 +75,8 @@
    <uses-permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"/>
    <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
-    <uses-permission android:name="android.permission.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.HARDWARE_TEST"/>
    <uses-permission android:name="android.permission.BLUETOOTH"/>
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
--- a/services/tests/mockingservicestests/AndroidManifest.xml
+++ b/services/tests/mockingservicestests/AndroidManifest.xml
@@ -27,7 +27,8 @@
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
    <uses-permission android:name="android.permission.MANAGE_APPOPS"/>
    <uses-permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS"/>
-    <uses-permission android:name="android.permission.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.WAKE_LOCK"/>
    <uses-permission
        android:name="android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD"/>
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -74,7 +74,8 @@
    <uses-permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"/>
    <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
-    <uses-permission android:name="android.permission.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.HARDWARE_TEST"/>
    <uses-permission android:name="android.permission.BLUETOOTH"/>
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
--- a/services/tests/uiservicestests/AndroidManifest.xml
+++ b/services/tests/uiservicestests/AndroidManifest.xml
@@ -33,7 +33,8 @@
    <uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" />
    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT"/>
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.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.ACCESS_KEYGUARD_SECURE_STORAGE" />

    <application android:debuggable="true">
--- a/services/tests/wmtests/AndroidManifest.xml
+++ b/services/tests/wmtests/AndroidManifest.xml
@@ -42,7 +42,8 @@
    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE" />
    <uses-permission android:name="android.permission.CAPTURE_BLACKOUT_CONTENT"/>
-    <uses-permission android:name="android.permission.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.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION"/>