Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia26b51d76ecd4d12d40a54d77ef010eacee08589
This commit is contained in:
Shafik Nassar
2020-04-27 15:38:49 +00:00
committed by Automerger Merge Worker
parent fa496230e7 559792fb96
commit 0b047cffb6
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -4133,9 +4133,6 @@ public class AppOpsService extends IAppOpsService.Stub {
throws NumberFormatException, throws NumberFormatException,
XmlPullParserException, IOException { XmlPullParserException, IOException {
int opCode = Integer.parseInt(parser.getAttributeValue(null, "n")); int opCode = Integer.parseInt(parser.getAttributeValue(null, "n"));
if (isIgnoredAppOp(opCode)) {
return;
}
Op op = new Op(uidState, pkgName, opCode, uidState.uid); Op op = new Op(uidState, pkgName, opCode, uidState.uid);
final int mode = XmlUtils.readIntAttribute(parser, "m", final int mode = XmlUtils.readIntAttribute(parser, "m",
@@ -4170,16 +4167,6 @@ public class AppOpsService extends IAppOpsService.Stub {
ops.put(op.op, op); 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() { void writeState() {
synchronized (mFile) { synchronized (mFile) {
FileOutputStream stream; FileOutputStream stream;