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

Commit c3f416b6 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 

am: 0601a2a8

Change-Id: I4822a4cfddc768fd210f0fe74cf2345f88b0a1b7
parents ed8581bf 0601a2a8

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) {