diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 40b013cef2abf..018db17b18a92 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1857,6 +1857,10 @@ public class AppOpsService extends IAppOpsService.Stub {
                 for (int i = 0; i < callbackCount; i++) {
                     OnOpModeChangedListener callback = callbacks.valueAt(i);
 
+                    if (!callback.isWatchingUid(uid)) {
+                        continue;
+                    }
+
                     if (onlyForeground && (callback.getFlags()
                             & WATCH_FOREGROUND_CHANGES) == 0) {
                         continue;