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

Commit e1913786 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 am: f8e289c6 

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



Change-Id: I814392cdd57259f4b44413a76546a8883178357c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c7288de f8e289c6

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 */,