commit e8aff3294d7075731ba3e0b9b843e7d8abd3fc6d
author Manjeet Rulhania <mrulhania@google.com> Thu Apr 18 04:03:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 04:03:57 2024 +0000
tree 14436b6b3ed097f67e0514ae7c4a9f439d0c833b
parent dfd9bc25091f7ef8970ffcfa52f668ff2f758191
parent 365fe0cecc7a02f3b8bb8bd5db94f69b29371228

Merge "Add noteop command to note app ops from adb" into main

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

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index a1f80d0..1bd93e4 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5543,6 +5543,20 @@
                     }
                     return 0;
                 }
+                case "note": {
+                    int res = shell.parseUserPackageOp(true, err);
+                    if (res < 0) {
+                        return res;
+                    }
+                    if (shell.packageName != null) {
+                        shell.mInterface.noteOperation(shell.op, shell.packageUid,
+                                shell.packageName, shell.attributionTag, true,
+                                "appops note shell command", true);
+                    } else {
+                        return -1;
+                    }
+                    return 0;
+                }
                 case "start": {
                     int res = shell.parseUserPackageOp(true, err);
                     if (res < 0) {