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

Change-Id: Ia26b51d76ecd4d12d40a54d77ef010eacee08589

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

@@ -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;