diff options
| -rw-r--r-- | services/core/java/com/android/server/SystemConfig.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index 1a3ef73ca2a8..a508ebfdb950 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -106,6 +106,9 @@ public class SystemConfig { // 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<>(); @@ -694,6 +697,17 @@ public class SystemConfig { 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); |