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

Commit d9de60ce authored by Shafik Nassar's avatar Shafik Nassar Committed by Automerger Merge Worker
Browse files

Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev am: 559792fb 

Change-Id: I609502768d979f7e4acb828a1e919dc2b7b98d60
parents a088c85c 559792fb

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

+0 −13
Original line number Diff line number Diff line
@@ -4133,9 +4133,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
            throws NumberFormatException,

        XmlPullParserException, IOException {

        int opCode = Integer.parseInt(parser.getAttributeValue(null, "n"));

        if (isIgnoredAppOp(opCode)) {

            return;

        }

        Op op = new Op(uidState, pkgName, opCode, uidState.uid);



        final int mode = XmlUtils.readIntAttribute(parser, "m",
@@ -4170,16 +4167,6 @@ public class AppOpsService extends IAppOpsService.Stub { 
        ops.put(op.op, op);

    }



    //TODO(b/149995538): Remove once this has reached all affected devices

    private static boolean isIgnoredAppOp(int op) {

        switch (op) {

            case AppOpsManager.OP_MANAGE_EXTERNAL_STORAGE:

                return true;

            default:

                return false;

        }

    }



    void writeState() {

        synchronized (mFile) {

            FileOutputStream stream;