Merge "Fix null pointer exception during initialization"

2021-12-23 04:00:10 +00:00
parent e30047b059 35e226b0e7
commit 3253206523
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9510,7 +9510,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) {