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

Commit 35e226b0 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

Fix null pointer exception during initialization 

PackageManagerService ctor calls
InitAndSystemPackageHelper.initPackages() to create the
OverlayConfig object, but this object is needed inside the
initPackages() call, when parsing an updated system overlay
in ScanPackageHelper.assertPackageIsValid() -> isOverlayMutable

This change uses the OverlayConfig's singleton accessor as a
backup when the member isn't set

Bug: 211469178
Test: install APK from the bug, reboot - no crashloop
Change-Id: I0d2b2fc1317db963980dbd1ca84dc61d2bfec5f5
parent 30afad00

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

+2 −1
Original line number Diff line number Diff line
@@ -9490,7 +9490,8 @@ public class PackageManagerService extends IPackageManager.Stub 
    }



    boolean isOverlayMutable(String packageName) {

        return mOverlayConfig.isMutable(packageName);

        return (mOverlayConfig != null ? mOverlayConfig

                : OverlayConfig.getSystemInstance()).isMutable(packageName);

    }



    @ScanFlags int getSystemPackageScanFlags(File codePath) {