Merge "Check for null pkgList in fixSeInfoLocked()"

2018-03-08 19:47:00 +00:00
parent 4db9c07ac4 acfdfbec2a
commit c679db71e6
1 changed files with 3 additions and 0 deletions
--- 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 final class SharedUserSetting extends SettingBase {
     */
    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) {