Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f8a242 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Sysconfig: Allow runtime differentiation of product configuration" into main am: c30aeaf4 am: 3fc810ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2437552



Change-Id: I2c0d250dea6be413a818486c243f60cfefa8df41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9270ba2e 3fc810ee

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

+14 −0
Original line number Diff line number Diff line
@@ -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);