commit 9c1b415a20f7967ea6c541485d031a69f686d98d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 09 21:27:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 21:27:24 2018 +0000
tree 0f60874ed5f8cd0b430c69c13e7514f4f7b957b9
parent 9d06b102053452ce5dc2eec6290adee8adab4e25
parent 54807bb15b1a853ce09bf2ffce4f84f36cc37245

Merge "Check for null pkgList in fixSeInfoLocked()" into pi-dev

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

diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java
index 054f614..407ceb7 100644
--- a/services/core/java/com/android/server/pm/SharedUserSetting.java
+++ b/services/core/java/com/android/server/pm/SharedUserSetting.java
@@ -125,6 +125,9 @@
      */
     public void fixSeInfoLocked() {
         final List<PackageParser.Package> pkgList = getPackages();
+        if (pkgList == null || pkgList.size() == 0) {
+            return;
+        }
 
         for (PackageParser.Package pkg : pkgList) {
             if (pkg.applicationInfo.targetSdkVersion < seInfoTargetSdkVersion) {