From 31cf7a019345e01a58a73ddd6a6f7f8f2a4f17fb Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 5 Apr 2022 09:00:30 -0700 Subject: [PATCH] PMS write settings on shutdown regardless of pending type Realized that the prior refactor to write out settings is invalid because if the message type is different, it won't write out settings. The generic write method serializes everything, so there's just one call to that. Bug: 228086624 Test: presubmit Change-Id: I96f8dda03d7160779aaf30dad75f245eb150ed3c --- .../java/com/android/server/pm/PackageManagerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index bf80a466e0343..6a05ec1f1e746 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2876,8 +2876,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(); } }