commit cc63eda4e6defe6b0dd5dd3c8fa608cf6ff26011
author Maurice Chu <mochu@google.com> Mon Dec 02 15:39:59 2013 -0800
committer Maurice Chu <mochu@google.com> Mon Dec 02 15:39:59 2013 -0800
tree d12d92833a9448f8d8a218ce1980a80ec95c6e03
parent 88117c37e2c3f8601f295b74a3e804877afb78ee

Add additional check for valid Zip file before multidex install

Bug: 11895788
Change-Id: Id4f6e5b09be809eeb29367bebe78c03e49864cbf

library/src/android/support/multidex/MultiDexExtractor.java

diff --git a/library/src/android/support/multidex/MultiDexExtractor.java b/library/src/android/support/multidex/MultiDexExtractor.java
index e9eec82..66bf75f 100644
--- a/library/src/android/support/multidex/MultiDexExtractor.java
+++ b/library/src/android/support/multidex/MultiDexExtractor.java
@@ -64,9 +64,9 @@
      * @throws IOException if encounters a problem while reading or writing
      *         secondary dex files
      */
-    static List<File> load(ApplicationInfo applicationInfo, File dexDir)
+    static List<File> load(ApplicationInfo applicationInfo, File dexDir, boolean forceReload)
             throws IOException {
-        Log.i(TAG, "load(" + applicationInfo.sourceDir + ")");
+        Log.i(TAG, "load(" + applicationInfo.sourceDir + ", forceReload=" + forceReload + ")");
         File sourceApk = new File(applicationInfo.sourceDir);
         long lastModified = sourceApk.lastModified();
         String extractedFilePrefix = sourceApk.getName()
@@ -87,7 +87,7 @@
                 files.add(extractedFile);
 
                 Log.i(TAG, "Need extracted file " + extractedFile);
-                if (!extractedFile.isFile()) {
+                if (forceReload || !extractedFile.isFile()) {
                     Log.i(TAG, "Extraction is needed for file " + extractedFile);
                     int numAttempts = 0;
                     boolean isExtractionSuccessful = false;
@@ -133,6 +133,10 @@
         return files;
     }
 
+    /**
+     * This removes any old zip and dex files or extraneous files from the secondary-dexes
+     * directory.
+     */
     private static void prepareDexDir(File dexDir, final String extractedFilePrefix,
             final long sourceLastModified) throws IOException {
         dexDir.mkdir();
@@ -146,7 +150,7 @@
             @Override
             public boolean accept(File pathname) {
                 return (!pathname.getName().startsWith(extractedFilePrefix))
-                    || (pathname.lastModified() < sourceLastModified);
+                        || (pathname.lastModified() < sourceLastModified);
             }
         };
         File[] files = dexDir.listFiles(filter);
@@ -209,7 +213,7 @@
     /**
      * Returns whether the file is a valid zip file.
      */
-    private static boolean verifyZipFile(File file) {
+    static boolean verifyZipFile(File file) {
         try {
             ZipFile zipFile = new ZipFile(file);
             try {