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

Merge "PMS write settings on shutdown regardless of pending type" into tm-dev am: 47c493ab17 am: b3d7b7e2d1

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

Change-Id: I734f327afd0abb7faf7949365fde00593134cb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chiu
2022-04-11 15:57:23 +00:00
committed by Automerger Merge Worker
parent 2193406f54 b3d7b7e2d1
commit eee02b9f33
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2877,8 +2877,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
synchronized (mLock) {
mPackageUsage.writeNow(mSettings.getPackagesLocked());
if (mHandler.hasMessages(WRITE_SETTINGS)) {
mHandler.removeMessages(WRITE_SETTINGS);
if (mHandler.hasMessages(WRITE_SETTINGS)
|| mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)
|| mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
writeSettings();
}
}