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

Commit c812726b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in AppOpsService." into rvc-dev am: b19aa988 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11938963

Change-Id: I3f25ffeca4b5ccfb19b0a7911519cf7f8ee9a67a
parents 618a60b1 b19aa988

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

+1 −1
Original line number Diff line number Diff line
@@ -3744,7 +3744,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    mHandler.sendMessage(PooledLambda.obtainMessage(

                            AppOpsService::notifyOpChangedForAllPkgsInUid,

                            this, code, uidState.uid, true, null));

                } else {

                } else if (uidState.pkgOps != null) {

                    final ArraySet<ModeCallback> callbacks = mOpModeWatchers.get(code);

                    if (callbacks != null) {

                        for (int cbi = callbacks.size() - 1; cbi >= 0; cbi--) {