From 1dfc1abe33fd6a4cb61bf25f36f6f84d9e5aaf8b Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 1 May 2020 15:17:03 +0100
Subject: [PATCH] AppOpsService: Fix de-dup for change records on
 OpModeWatchers.

Whether a change record is a duplicate or not should be scoped to
a single set of change records.

Test: make
Bug: 153226372
Change-Id: Idb0c281d41002878c5ff25b6171ea525c3b028cd
---
 services/core/java/com/android/server/appop/AppOpsService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index de9b02ffd6362..d76ee685ca4d7 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -2545,11 +2545,11 @@ public class AppOpsService extends IAppOpsService.Stub {
         if (callbacks == null) {
             callbacks = new HashMap<>();
         }
-        boolean duplicate = false;
         final int N = cbs.size();
         for (int i=0; i<N; i++) {
             ModeCallback cb = cbs.valueAt(i);
             ArrayList<ChangeRec> reports = callbacks.get(cb);
+            boolean duplicate = false;
             if (reports == null) {
                 reports = new ArrayList<>();
                 callbacks.put(cb, reports);