commit 58946c2ad5738c8ccc84bd2e5bee1feb331a6882
author Louis Chang <louischang@google.com> Tue Sep 05 06:41:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 05 06:41:45 2023 +0000
tree 1bddf414d8c6261d3569fb0a07bed39cfb0b909b
parent 85bfa56017d40b5227ec5cb4ef04a5e5dd38fc67
parent a60a96f2b5e6da6898b6285f4fbb8bd37ce9a3a5

Merge "Prevent system restart while updating package during boot" into main

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 53d1adf..fd42077 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6183,6 +6183,8 @@
         @Override
         public void onPackageReplaced(ApplicationInfo aInfo) {
             synchronized (mGlobalLock) {
+                // In case if setWindowManager hasn't been called yet when booting.
+                if (mRootWindowContainer == null) return;
                 mRootWindowContainer.updateActivityApplicationInfo(aInfo);
             }
         }