commit c30aeaf42a06d60acf077d575ea65a75453c1133
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 23 00:48:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 23 00:48:01 2024 +0000
tree f25e6b5647b5e46b87cf667f9e6fae5b5364d0ea
parent 667714347f342a6b1997715c8f0a7a3a18eb573d
parent e1a8385d58b2852dbd8ef8ceebc6c09c67df80ea

Merge "Sysconfig: Allow runtime differentiation of product configuration" into main

services/core/java/com/android/server/SystemConfig.java

diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
index 35e7422..79620cf 100644
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -103,6 +103,9 @@
     // property for runtime configuration differentiation in vendor
     private static final String VENDOR_SKU_PROPERTY = "ro.boot.product.vendor.sku";
 
+    // property for runtime configuration differentation in product
+    private static final String PRODUCT_SKU_PROPERTY = "ro.boot.hardware.sku";
+
     private static final ArrayMap<String, ArraySet<String>> EMPTY_PERMISSIONS =
             new ArrayMap<>();
 
@@ -657,6 +660,17 @@
         readPermissions(parser, Environment.buildPath(
                 Environment.getProductDirectory(), "etc", "permissions"), productPermissionFlag);
 
+        String productSkuProperty = SystemProperties.get(PRODUCT_SKU_PROPERTY, "");
+        if (!productSkuProperty.isEmpty()) {
+            String productSkuDir = "sku_" + productSkuProperty;
+            readPermissions(parser, Environment.buildPath(
+                    Environment.getProductDirectory(), "etc", "sysconfig", productSkuDir),
+                    productPermissionFlag);
+            readPermissions(parser, Environment.buildPath(
+                    Environment.getProductDirectory(), "etc", "permissions", productSkuDir),
+                    productPermissionFlag);
+        }
+
         // Allow /system_ext to customize all system configs
         readPermissions(parser, Environment.buildPath(
                 Environment.getSystemExtDirectory(), "etc", "sysconfig"), ALLOW_ALL);