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

Commit df9836cc authored by shafik's avatar shafik
Browse files

MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp 

We previously had to add this to fix an issue where we used to setMode
instead of setUidMode. Now that this change has rolled out to DP2 and
the relevant populations, we can safely remove this check.

Test: build
Fix: 149995538
Change-Id: Ib6ba0a9bdacb16cc53f5883d34d67c2df92d4161
parent f3b2dc9b

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

+0 −13
Original line number Diff line number Diff line
@@ -4134,9 +4134,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",
@@ -4171,16 +4168,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;