Merge "Correctly log op state if ops restriction is set"

2019-10-31 05:11:54 +00:00
parent 7956435faf f56fe2c2a3
commit 020c4c8912
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1182,8 +1182,8 @@ public class AppOpsService extends IAppOpsService.Stub {
            }
        } else {
            for (int j=0; j<ops.length; j++) {
-                int code = uidState.opModes.keyAt(j);
-                if (code >= 0) {
+                int code = ops[j];
+                if (uidState.opModes.indexOfKey(code) >= 0) {
                    if (resOps == null) {
                        resOps = new ArrayList<>();
                    }