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

Commit 6488c40d authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent system restart while updating package during boot" into udc-dev... 

Merge "Prevent system restart while updating package during boot" into udc-dev am: f8e289c6 am: e1913786

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22983796



Change-Id: I251dddf0449fc76019237bb9fb957880d161d649
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11211c5a e1913786

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

+2 −0
Original line number Diff line number Diff line
@@ -6336,6 +6336,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 */,