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 am: f8e289c6db am: 65e6378ff7

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

Change-Id: I6578a5c8d0695a1ea78408ec1c9e923b821b0c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2023-05-03 08:54:52 +00:00
committed by Automerger Merge Worker
parent 0832af850d 65e6378ff7
commit 2a1c02e39b
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 */,