summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-05 19:40:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-05 19:40:33 +0000
commit25f9e535719655ba3293754c282b4506b8ba988f (patch)
tree4e3d791578e710b47f0965047cb4bcaba9091a92
parentc9848c410ff503d23a939b30a0452d886612cea5 (diff)
parentae928357d15cf99e074fa3176eef603f5dd85a1a (diff)
downloadmultidex-25f9e535719655ba3293754c282b4506b8ba988f.tar.gz
Merge "Don't throw away the cause of multidex installation failures" am: ae928357d1android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/1842533 Change-Id: I91b8c25810e2f58c1fe8204712c688a993254dde
-rw-r--r--library/src/androidx/multidex/MultiDex.java10
1 files changed, 8 insertions, 2 deletions
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 @@ public final class MultiDex {
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 @@ public final class MultiDex {
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");
}