commit e5fffd4b834b3f2649019a63de7a3991c875e36d
author Calin Juravle <calin@google.com> Fri Apr 07 00:38:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 07 00:38:23 2017 +0000
tree 3c3d358e570d3e3c8ba0f643cd3af568ac198297
parent e5b210fc550d5d9a7ec99fd8700865aa74fd00aa
parent d34076385d34ee4b4d4712e33d10133d08339d49

Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev
am: d34076385d

Change-Id: I498941457eba58e39d1a57238ed3c7e66cb278e3

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ce4d7ee..38a3089 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8573,6 +8573,7 @@
     @Override
     public boolean performDexOptSecondary(String packageName, String compilerFilter,
             boolean force) {
+        mDexManager.reconcileSecondaryDexFiles(packageName);
         return mDexManager.dexoptSecondaryDex(packageName, compilerFilter, force);
     }