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

Commit 43799554 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

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

parents 1c85c450 1dfc1abe

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

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