Merge "Avoid NPE"

2021-09-22 15:07:49 +00:00
parent 76553c43fa 979796d080
commit 1a1c6c87f6
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ComponentAliasResolver.java
+++ b/services/core/java/com/android/server/am/ComponentAliasResolver.java
@@ -157,6 +157,9 @@ public class ComponentAliasResolver {
     */
    public void update(String overrides) {
        synchronized (mLock) {
+            if (mPlatformCompat == null) {
+                return; // System not ready.
+            }
            final boolean enabled = mPlatformCompat.isChangeEnabledByPackageName(
                    USE_EXPERIMENTAL_COMPONENT_ALIAS, "android", UserHandle.USER_SYSTEM);
            if (enabled != mEnabled) {