Merge "Fix NPE in AppOpsService." into rvc-dev

2020-06-22 22:14:52 +00:00
parent bd0b819c21 d2ebc10e78
commit b19aa9888f
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -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--) {