Merge "Support installation of DexMetadata files (.dm)"

diff --cc core/java/android/content/pm/PackageManager.java
Simple merge

diff --cc core/java/android/content/pm/PackageParser.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageInstallerSession.java
index a43818a,087b6a3..cc448da
--- 1/services/core/java/com/android/server/pm/PackageInstallerSession.java
--- 2/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@@ -936,9 -942,18 +940,18 @@@ public class PackageInstallerSession ex
  
          mRelinquished = true;
          mPm.installStage(mPackageName, stageDir, localObserver, params,
 -                mInstallerPackageName, mInstallerUid, user, mCertificates);
 +                mInstallerPackageName, mInstallerUid, user, mSigningDetails);
      }
  
+     private static void maybeRenameFile(File from, File to) throws PackageManagerException {
+         if (!from.equals(to)) {
+             if (!from.renameTo(to)) {
+                 throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR,
+                         "Could not rename file " + from + " to " + to);
+             }
+         }
+     }
+ 
      /**
       * Validate install by confirming that all application packages are have
       * consistent package name, version code, and signing certificates.

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerShellCommand.java
Simple merge