commit 30f8df9623a7107a03cb4187ab54142279513719
author Yohann Roussel <yroussel@google.com> Thu May 19 14:09:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 19 14:09:25 2016 +0000
tree fdfe02803ceebfd76b11852283099e8ab70e76b4
parent cff666cb6d6bdd814276b18e9bd254aa53188d09
parent 49cbce3746ccc34ce803dca0ee3862e31a7efe63

Fix handling of suppressed exception am: 74e66b8013 am: a257da82d2 am: 0f710c5d3c
am: 49cbce3746

* commit '49cbce3746ccc34ce803dca0ee3862e31a7efe63':
  Fix handling of suppressed exception

Change-Id: I79c1bebbe7b91349bf9cd35d58eba81ba898dd4e

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);
             }
         }