Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into rvc-dev am: 4379955437

Browse Source 
Change-Id: I15b32d2a0514945d6e05164dd213af3db01f959e
This commit is contained in:
Narayan Kamath
2020-05-04 08:19:11 +00:00
committed by Automerger Merge Worker
parent ea25bab747 4379955437
commit 911403e500
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -2545,11 +2545,11 @@ public class AppOpsService extends IAppOpsService.Stub {
if (callbacks == null) { if (callbacks == null) {
callbacks = new HashMap<>(); callbacks = new HashMap<>();
} }
boolean duplicate = false;
final int N = cbs.size(); final int N = cbs.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
ModeCallback cb = cbs.valueAt(i); ModeCallback cb = cbs.valueAt(i);
ArrayList<ChangeRec> reports = callbacks.get(cb); ArrayList<ChangeRec> reports = callbacks.get(cb);
boolean duplicate = false;
if (reports == null) { if (reports == null) {
reports = new ArrayList<>(); reports = new ArrayList<>();
callbacks.put(cb, reports); callbacks.put(cb, reports);