Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -10004,6 +10004,7 @@ public class PackageManagerService extends IPackageManager.Stub
     public void shutdown() {
         mPackageUsage.writeNow(mPackages);
         mCompilerStats.writeNow();
+        mDexManager.savePackageDexUsageNow();
     }
 
     @Override

services/core/java/com/android/server/pm/dex/DexManager.java

@@ -592,6 +592,13 @@ public class DexManager {
         return existingValue == null ? newValue : existingValue;
     }
 
+    /**
+     * Saves the in-memory package dex usage to disk right away.
+     */
+    public void savePackageDexUsageNow() {
+        mPackageDexUsage.writeNow();
+    }
+
     public static class RegisterDexModuleResult {
         public RegisterDexModuleResult() {
             this(false, null);

services/core/java/com/android/server/pm/dex/PackageDexUsage.java

@@ -198,8 +198,12 @@ public class PackageDexUsage extends AbstractStatsBase<Void> {
      * Convenience method for async writes which does not force the user to pass a useless
      * (Void) null.
      */
-    public void maybeWriteAsync() {
-      maybeWriteAsync((Void) null);
+    /*package*/ void maybeWriteAsync() {
+      maybeWriteAsync(null);
+    }
+
+    /*package*/ void writeNow() {
+        writeInternal(null);
     }
 
     @Override