From 8ff1d001aa18bc10685df41f5fcaddf27fd0f324 Mon Sep 17 00:00:00 2001
From: Evan Severson <evanseverson@google.com>
Date: Mon, 27 Mar 2023 21:48:56 +0000
Subject: [PATCH] Revert "Revert "Only invoke for callbacks watching the given
 pac..."

Revert submission 22262229-revert-21960657-TEBKYKOPLW

Reason for revert: Fixed parent CL

Reverted changes: /q/submissionid:22262229-revert-21960657-TEBKYKOPLW

Change-Id: Id49f7464045c01cb6bbbfcb852adaaf7eb64e10f
---
 .../core/java/com/android/server/appop/AppOpsService.java     | 4 ++++
 1 file changed, 4 insertions(+)

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;