From 2e1192c4eb46a16f1708cbf6c8a23d9d5150ce82 Mon Sep 17 00:00:00 2001
From: Kevin Han <kevhan@google.com>
Date: Wed, 21 Apr 2021 13:00:31 -0700
Subject: [PATCH] Add null pointer check to getStopped

PackageSetting is not guaranteed to be non-null which caused test
failures. This adds a null check.

Bug: 184936704
Test: presubmit
Change-Id: Ie58ffa0d9abde5417e4db48389e526eaf43e0cf6
---
 .../core/java/com/android/server/pm/PackageManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 59039baf2764a..2d1d194379525 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -23444,7 +23444,7 @@ public class PackageManagerService extends IPackageManager.Stub
         // writer
         synchronized (mLock) {
             final PackageSetting ps = mSettings.getPackageLPr(packageName);
-            if (ps.getStopped(userId) && !stopped) {
+            if (ps != null && ps.getStopped(userId) && !stopped) {
                 shouldUnhibernate = true;
             }
             if (!shouldFilterApplicationLocked(ps, callingUid, userId)