From 979796d080a5b229ea708b55c84e65ecb05da5f9 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 21 Sep 2021 17:18:31 -0700
Subject: [PATCH] Avoid NPE

Bug: 196254758
Test: boot
Change-Id: Ic3ed8253f7644afbcc4c00ac2cf0ee054ca16922
---
 .../java/com/android/server/am/ComponentAliasResolver.java     | 3 +++
 1 file changed, 3 insertions(+)

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) {