summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-05 20:12:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-05 20:12:10 +0000
commit011eb1c566949359ddac31517902d56d8d708b8d (patch)
tree4e3d791578e710b47f0965047cb4bcaba9091a92
parentc9848c410ff503d23a939b30a0452d886612cea5 (diff)
parentdff468c24a946d969c25954d2a757684f0f4091b (diff)
downloadmultidex-011eb1c566949359ddac31517902d56d8d708b8d.tar.gz
Merge "Don't throw away the cause of multidex installation failures" am: ae928357d1 am: 25f9e53571 am: dff468c24aandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/1842533 Change-Id: Idba75c0139f0cd13a2ea584872c16b9405b7cfe2
-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");
}