commit 1247e62e916098962f95dcba3b49d84e5ace380b
author Yohann Roussel <yroussel@google.com> Tue May 17 18:00:18 2016 +0200
committer Yohann Roussel <yroussel@google.com> Thu May 19 15:51:27 2016 +0200
tree fdfe02803ceebfd76b11852283099e8ab70e76b4
parent cff666cb6d6bdd814276b18e9bd254aa53188d09

Fix handling of suppressed exception

On API 19 and 20, the library was trying to save "suppressed exceptions"
in the loader.dexElementsSuppressedExceptions but the field is not
there, it's in DexPathList, so the correct path is
loader.pathList.dexElementsSuppressedExceptions.

Bug: 28808797

(cherry picked from commit 74e66b8013b5b9002f67e53825c189a18597b1e8)

Change-Id: Ibd6e623d037a706a78c79eff47b17fe9a86fced2

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

diff --git a/library/src/android/support/multidex/MultiDex.java b/library/src/android/support/multidex/MultiDex.java
index 1e04c19..982bfbf 100644
--- a/library/src/android/support/multidex/MultiDex.java
+++ b/library/src/android/support/multidex/MultiDex.java
@@ -425,9 +425,9 @@
                     Log.w(TAG, "Exception in makeDexElement", e);
                 }
                 Field suppressedExceptionsField =
-                        findField(loader, "dexElementsSuppressedExceptions");
+                        findField(dexPathList, "dexElementsSuppressedExceptions");
                 IOException[] dexElementsSuppressedExceptions =
-                        (IOException[]) suppressedExceptionsField.get(loader);
+                        (IOException[]) suppressedExceptionsField.get(dexPathList);
 
                 if (dexElementsSuppressedExceptions == null) {
                     dexElementsSuppressedExceptions =
@@ -443,7 +443,7 @@
                     dexElementsSuppressedExceptions = combined;
                 }
 
-                suppressedExceptionsField.set(loader, dexElementsSuppressedExceptions);
+                suppressedExceptionsField.set(dexPathList, dexElementsSuppressedExceptions);
             }
         }