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

Commit 7f7fd693 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: I0c70e239d046272b8165cfa885901fb543f2c100
parents 71cab503 cf70a17a
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -8613,7 +8613,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