Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c1aee92 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

PackageManagerService: fix NPE while renaming foreign dex markers. 

am: cf70a17a

Change-Id: I565e13f9b6c74f3cbf0467527920549d2614d10d
parents 303bb79b cf70a17a

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

+5 −1
Original line number Diff line number Diff line
@@ -8619,7 +8619,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
            // We don't expect installation to fail beyond this point















            if (pkgSetting.pkg != null) {













                maybeRenameForeignDexMarkers(pkgSetting.pkg, pkg, user);













                // Note that |user| might be null during the initial boot scan. If a codePath













                // for an app has changed during a boot scan, it's due to an app update that's













                // part of the system partition and marker changes must be applied to all users.













                maybeRenameForeignDexMarkers(pkgSetting.pkg, pkg,













                    (user != null) ? user : UserHandle.ALL);















            }





























            // Add the new setting to mSettings