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

Commit 61a6f01a authored by Narayan Kamath's avatar Narayan Kamath Committed by The Android Automerger
Browse files

PackageManagerService: fix NPE while renaming foreign dex markers. 

The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.

bug: 29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2
parent 39bf221e

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

+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