Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26ba1a7d authored by Narayan Kamath's avatar Narayan Kamath Committed by Automerger Merge Worker
Browse files

Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into... 

Merge "AppOpsService: Fix de-dup for change records on OpModeWatchers." into rvc-dev am: 43799554 am: 5399cde3 am: 9e74b573

Change-Id: I3d8a90299d11f34cdd2304f066ccaa6853729779
parents 0e3430e7 9e74b573

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

+1 −1
Original line number Diff line number Diff line
@@ -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);