diff options
| author | 2022-04-11 15:40:26 +0000 | |
|---|---|---|
| committer | 2022-04-11 15:40:26 +0000 | |
| commit | b3d7b7e2d1504e8c384c97c4228e21280612e554 (patch) | |
| tree | b10a697262b4a0450dee7d22e8cec0a005e90dd4 | |
| parent | 9ef7cee4d0d4542cbd1324c29b6eae08c342b8eb (diff) | |
| parent | 47c493ab17700f97c547eb70086ae0468b3be98a (diff) | |
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: I7e4974caee5b377398373dbd76a35da29c369fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 5 |
1 files 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 e1af9a7ab96f..ce1ee70ca5ac 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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(); } } |