Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1651e1b5 authored by Louis Chang's avatar Louis Chang
Browse files

Prevent system restart while updating package during boot 

No-op if RWC is not yet created.

Bug: 279008103
Test: wm presubmit
Change-Id: Ib37a2b8d08089416d05ae40f06f4807c9125c1e3
parent 1ce89ea1

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

+2 −0
Original line number Diff line number Diff line
@@ -6287,6 +6287,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        public void cleanupDisabledPackageComponents(

                String packageName, Set<String> disabledClasses, int userId, boolean booted) {

            synchronized (mGlobalLock) {

                // In case if setWindowManager hasn't been called yet when booting.

                if (mRootWindowContainer == null) return;

                // Clean-up disabled activities.

                if (mRootWindowContainer.finishDisabledPackageActivities(

                        packageName, disabledClasses, true /* doit */, false /* evenPersistent */,