commit 979796d080a5b229ea708b55c84e65ecb05da5f9
author Makoto Onuki <omakoto@google.com> Tue Sep 21 17:18:31 2021 -0700
committer Makoto Onuki <omakoto@google.com> Tue Sep 21 17:18:31 2021 -0700
tree af5b6945319a5b529d2f29b4acfb58bb3e8fafeb
parent 1ba3d33a9e141cb60468d3db817a43a76a7d4419

Avoid NPE

Bug: 196254758
Test: boot
Change-Id: Ic3ed8253f7644afbcc4c00ac2cf0ee054ca16922

services/core/java/com/android/server/am/ComponentAliasResolver.java

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