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

Commit d0bf0544 authored by Gabriele M's avatar Gabriele M
Browse files

Change visibility of the Privacy Guard ops set 

Change-Id: Iafcf058f5e2074982bf45f8c82ef8d027b9358f0
parent 72a04fde

core/java/android/app/AppOpsManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,14 @@ public class AppOpsManager { 


    private static HashMap<String, Integer> sNameToOp = new HashMap<String, Integer>();



    public static final int[] PRIVACY_GUARD_OP_STATES = new int[] {

            OP_COARSE_LOCATION,

            OP_READ_CALL_LOG,

            OP_READ_CONTACTS,

            OP_READ_CALENDAR,

            OP_READ_SMS,

    };



    static {

        if (sOpToSwitch.length != _NUM_OP) {

            throw new IllegalStateException("sOpToSwitch length " + sOpToSwitch.length

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

+2 −10
Original line number Diff line number Diff line
@@ -107,14 +107,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
    private PowerManager mPowerManager;

    private final ActivityManagerService mActivityManagerService;



    private static final int[] PRIVACY_GUARD_OP_STATES = new int[] {

        AppOpsManager.OP_COARSE_LOCATION,

        AppOpsManager.OP_READ_CALL_LOG,

        AppOpsManager.OP_READ_CONTACTS,

        AppOpsManager.OP_READ_CALENDAR,

        AppOpsManager.OP_READ_SMS

    };



    boolean mWriteScheduled;

    boolean mFastWriteScheduled;

    final Runnable mWriteRunner = new Runnable() {
@@ -2891,7 +2883,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


    @Override

    public boolean getPrivacyGuardSettingForPackage(int uid, String packageName) {

        for (int op : PRIVACY_GUARD_OP_STATES) {

        for (int op : AppOpsManager.PRIVACY_GUARD_OP_STATES) {

            int switchOp = AppOpsManager.opToSwitch(op);

            int mode = checkOperation(op, uid, packageName);

            if (mode != AppOpsManager.MODE_ALLOWED && mode != AppOpsManager.MODE_IGNORED) {
@@ -2903,7 +2895,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


    @Override

    public void setPrivacyGuardSettingForPackage(int uid, String packageName, boolean state) {

        for (int op : PRIVACY_GUARD_OP_STATES) {

        for (int op : AppOpsManager.PRIVACY_GUARD_OP_STATES) {

            int switchOp = AppOpsManager.opToSwitch(op);

            setMode(switchOp, uid, packageName, state

                    ? AppOpsManager.MODE_ASK : AppOpsManager.MODE_ALLOWED);