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

Commit 0601a2a8 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by android-build-merger
Browse files

Merge "Allow all system configs in /product" 

am: eca4c3a0

Change-Id: I417fcac7ba8fd76a244f274144d5713dfa01329c
parents 7655d9dd eca4c3a0

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

+3 −5
Original line number Diff line number Diff line
@@ -319,13 +319,11 @@ public class SystemConfig { 
        readPermissions(Environment.buildPath(

                Environment.getOemDirectory(), "etc", "permissions"), oemPermissionFlag);



        // Allow Product to customize system configs around libs, features, permissions and apps

        int productPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PERMISSIONS |

                ALLOW_APP_CONFIGS | ALLOW_PRIVAPP_PERMISSIONS;

        // Allow Product to customize all system configs

        readPermissions(Environment.buildPath(

                Environment.getProductDirectory(), "etc", "sysconfig"), productPermissionFlag);

                Environment.getProductDirectory(), "etc", "sysconfig"), ALLOW_ALL);

        readPermissions(Environment.buildPath(

                Environment.getProductDirectory(), "etc", "permissions"), productPermissionFlag);

                Environment.getProductDirectory(), "etc", "permissions"), ALLOW_ALL);

    }



    void readPermissions(File libraryDir, int permissionFlag) {