diff --git a/services/core/java/com/android/server/am/ComponentAliasResolver.java b/services/core/java/com/android/server/am/ComponentAliasResolver.java index 00b0e83f74323..23553a7cf12ab 100644 --- 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) {