commit 3014a156b84a468e606d45479c584e622b4f1009
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 05 20:43:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 05 20:43:29 2021 +0000
tree 4e3d791578e710b47f0965047cb4bcaba9091a92
parent 8862967b16fda7c68cb771e421b935e62cd1cd12
parent b84604dcca22890d3ab03f8cfeb56aec09db390a

Merge "Don't throw away the cause of multidex installation failures" am: ae928357d1 am: 25f9e53571 am: dff468c24a am: 011eb1c566 am: b84604dcca

Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/1842533

Change-Id: I3d73ed4365d35a8d6104db52b88247f7ebd54814

library/src/androidx/multidex/MultiDex.java

diff --git a/library/src/androidx/multidex/MultiDex.java b/library/src/androidx/multidex/MultiDex.java
index c038709..ae4e558 100644
--- a/library/src/androidx/multidex/MultiDex.java
+++ b/library/src/androidx/multidex/MultiDex.java
@@ -117,9 +117,12 @@
                     NO_KEY_PREFIX,
                     true);
 
+        } catch (RuntimeException e) {
+            Log.e(TAG, "MultiDex installation failure", e);
+            throw e;
         } catch (Exception e) {
             Log.e(TAG, "MultiDex installation failure", e);
-            throw new RuntimeException("MultiDex installation failed (" + e.getMessage() + ").");
+            throw new RuntimeException("MultiDex installation failed.", e);
         }
         Log.i(TAG, "install done");
     }
@@ -181,9 +184,12 @@
                     CODE_CACHE_SECONDARY_FOLDER_NAME,
                     NO_KEY_PREFIX,
                     false);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "MultiDex installation failure", e);
+            throw e;
         } catch (Exception e) {
             Log.e(TAG, "MultiDex installation failure", e);
-            throw new RuntimeException("MultiDex installation failed (" + e.getMessage() + ").");
+            throw new RuntimeException("MultiDex installation failed.", e);
         }
         Log.i(TAG, "Installation done");
     }