Merge "Store package restriction settings at shutdown" am: 888c45b484 am: f67b9f6dc0

am: 1cd987a1d1 Change-Id: Ifeb6aa9ee2d087827fb9592fdf2d4d8de6924d8b
2018-03-07 20:17:15 +00:00
parent e69eeb2f81 1cd987a1d1
commit 2537718a12
1 changed files with 11 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -9343,6 +9343,17 @@ public class PackageManagerService extends IPackageManager.Stub
        mPackageUsage.writeNow(mPackages);
        mCompilerStats.writeNow();
        mDexManager.writePackageDexUsageNow();
+
+        // This is the last chance to write out pending restriction settings
+        synchronized (mPackages) {
+            if (mHandler.hasMessages(WRITE_PACKAGE_RESTRICTIONS)) {
+                mHandler.removeMessages(WRITE_PACKAGE_RESTRICTIONS);
+                for (int userId : mDirtyUsers) {
+                    mSettings.writePackageRestrictionsLPr(userId);
+                }
+                mDirtyUsers.clear();
+            }
+        }
    }

    @Override