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

Commit 4646b94d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "AppOps: remove uid control mechanism for default behavior""

parents 43225e21 e9bcd028

services/java/com/android/server/AppOpsService.java

+3 −4
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
    static final boolean DEBUG = false;

    static final int SHOW_PERMISSION_DIALOG = 1;

    static final String WHITELIST_FILE = "persist.sys.whitelist";

    static final String DEFAULT_WHITELIST_FILE = "/system/etc/whitelist_appops.xml";



    // Write at most every 30 minutes.

    static final long WRITE_DELAY = DEBUG ? 1000 : 30*60*1000;
@@ -1158,7 +1157,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
        if (!mStrictEnable)

            return false;



        return (!isInWhitelist(packageName));

        return ((uid > Process.FIRST_APPLICATION_UID) &&

            !isInWhitelist(packageName));

    }



    private boolean isInWhitelist(String packageName) {
@@ -1292,8 +1292,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


    void readWhitelist() {

        // Read if whitelist file provided

        String whitelistFileName = SystemProperties.get(WHITELIST_FILE,

                DEFAULT_WHITELIST_FILE);

        String whitelistFileName = SystemProperties.get(WHITELIST_FILE);

        if(!mStrictEnable || "".equals(whitelistFileName)) {

            return;

        }