commit 1a1c6c87f6b956fe583dd0928fe5eb6f0750b90c
author Makoto Onuki <omakoto@google.com> Wed Sep 22 15:07:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 22 15:07:49 2021 +0000
tree 5cfb00a35999d3b9c2d3aa79f481b0e86916f3d5
parent 76553c43fa2a242b3ca9910d325fc804bdd40073
parent 979796d080a5b229ea708b55c84e65ecb05da5f9

Merge "Avoid NPE"

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