Merge "Onboard new native namespace" into main

1 files changed, 23 insertions, 13 deletions

diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index b79ba7ba6b45..10a1b9e6c095 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -115,28 +115,38 @@ public class SettingsToPropertiesMapper {
     };
 
     // All the aconfig flags under the listed DeviceConfig scopes will be synced to native level.
+    // The list is sorted.
     @VisibleForTesting
     static final String[] sDeviceConfigAconfigScopes = new String[] {
+        "android_core_networking",
+        "arc_next",
         "biometrics_framework",
-        "core_experiments_team_internal",
+        "biometrics_integration",
         "camera_platform",
-        "power",
-        "vibrator",
+        "car_framework",
+        "car_perception",
+        "car_security",
+        "car_telemetry",
+        "codec_fwk",
+        "core_experiments_team_internal",
         "haptics",
-        "text",
-        "arc_next",
-        "test_suites",
         "hardware_backed_security_mainline",
-        "threadnetwork",
         "media_solutions",
+        "nfc",
+        "pixel_system_sw_touch",
+        "pixel_watch",
+        "power",
         "responsible_apis",
         "rust",
-        "pixel_biometrics",
-        "car_perception",
-        "car_security",
-        "car_telemetry",
-        "car_framework",
-        "android-nfc",
+        "test_suites",
+        "text",
+        "threadnetwork",
+        "vibrator",
+        "wear_frameworks",
+        "wear_system_health",
+        "wear_systems",
+        "window_surfaces",
+        "windowing_frontend"
     };
 
     private final String[] mGlobalSettings;