Merge "PMS write settings on shutdown regardless of pending type" into tm-dev am: 47c493ab17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17589578 Change-Id: I23f35b66977577886a2eb8f253c1876e8a6c2117 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user