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

Commit f8e289c6 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

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

parents b1c7e145 1651e1b5

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