Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Louis Chang
2023-05-03 07:33:43 +00:00
committed by Android (Google) Code Review
parent b1c7e14560 1651e1b5d5
commit f8e289c6db
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -6336,6 +6336,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
public void cleanupDisabledPackageComponents( public void cleanupDisabledPackageComponents(
String packageName, Set<String> disabledClasses, int userId, boolean booted) { String packageName, Set<String> disabledClasses, int userId, boolean booted) {
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
// In case if setWindowManager hasn't been called yet when booting.
if (mRootWindowContainer == null) return;
// Clean-up disabled activities. // Clean-up disabled activities.
if (mRootWindowContainer.finishDisabledPackageActivities( if (mRootWindowContainer.finishDisabledPackageActivities(
packageName, disabledClasses, true /* doit */, false /* evenPersistent */, packageName, disabledClasses, true /* doit */, false /* evenPersistent */,