Merge "Don't throw away the cause of multidex installation failures" am: ae928357d1 am: 25f9e53571 am: dff468c24a
Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/1842533
Change-Id: Idba75c0139f0cd13a2ea584872c16b9405b7cfe2
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");
}