commit fab930147761d766e1d9a5b3c64e4e0ac297a84f
author Nicholas Sauer <nicksauer@google.com> Mon Jul 29 08:33:16 2019 -0700
committer Nicholas Sauer <nicksauer@google.com> Tue Jul 30 15:57:08 2019 +0000
tree 0eb5fe36208290380abc39c6f7d55a53c63e67d5
parent a08edfaedbdc518a790b6d06e7e998e42ab4eec6

Check for null in getDeviceOwnerOrProfileOwnerPackage

This prevents a system crash when running SessionTest on secondary
users.

bug: 138118013
bug: 138120084
Test: cts-tradefed run cts-dev -m CtsPackageInstallTestCases -t android.packageinstaller.install.cts.SessionTest
and cts-tradefed run cts-dev -m CtsPermission2TestCases -t android.permission2.cts.RestrictedPermissionsTest#onSideLoadRestrictedPermissionsWhitelistingDefault
Change-Id: I2be4d3121666c107aaf32113f7c13a9b5b3ff5dd

services/core/java/com/android/server/pm/ProtectedPackages.java

diff --git a/services/core/java/com/android/server/pm/ProtectedPackages.java b/services/core/java/com/android/server/pm/ProtectedPackages.java
index a374e14..231168e 100644
--- a/services/core/java/com/android/server/pm/ProtectedPackages.java
+++ b/services/core/java/com/android/server/pm/ProtectedPackages.java
@@ -92,6 +92,9 @@
         if (mDeviceOwnerUserId == userId) {
             return mDeviceOwnerPackage;
         }
+        if (mProfileOwnerPackages == null) {
+            return null;
+        }
         return mProfileOwnerPackages.get(userId);
     }