From d2ebc10e78a7d6d4104ba6c3a4254960fbbe8b3e Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Fri, 19 Jun 2020 18:03:18 -0700
Subject: [PATCH] Fix NPE in AppOpsService.

UidState.pkgOps might be null when it is empty.

Test: presubmit
Fixes: 155148115
Change-Id: If931abd4484856fa77fbd402114d8c3b48f8d181
---
 services/core/java/com/android/server/appop/AppOpsService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 73c98da6aa568..2ea15f6279111 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -3735,7 +3735,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--) {