Merge "Handle ALL_OPs case in ModeCallBack.toString"

2020-02-15 03:56:43 +00:00
parent 8283e0227c b992f8cc27
commit 9a5d3ad5e0
1 changed files with 10 additions and 3 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1236,9 +1236,16 @@ public class AppOpsService extends IAppOpsService.Stub {
            UserHandle.formatUid(sb, mWatchingUid);
            sb.append(" flags=0x");
            sb.append(Integer.toHexString(mFlags));
-            if (mWatchedOpCode != OP_NONE) {
-                sb.append(" op=");
-                sb.append(opToName(mWatchedOpCode));
+            switch (mWatchedOpCode) {
+                case OP_NONE:
+                    break;
+                case ALL_OPS:
+                    sb.append(" op=(all)");
+                    break;
+                default:
+                    sb.append(" op=");
+                    sb.append(opToName(mWatchedOpCode));
+                    break;
            }
            sb.append(" from uid=");
            UserHandle.formatUid(sb, mCallingUid);