Merge "PMS write settings on shutdown regardless of pending type" into tm-dev

2022-04-11 15:39:42 +00:00
parent ff2c2c8aa0 31cf7a0193
commit 47c493ab17
1 changed files with 3 additions and 2 deletions
--- 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();
            }
        }