commit 4aa76f83eb54b9d5c27a0a24ecd89e98c08fff11
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Oct 06 03:07:15 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Oct 06 03:07:15 2021 +0000
tree 4e3d791578e710b47f0965047cb4bcaba9091a92
parent 4fd9c38bd6f8ddf4bc8f8e530ea03d6813b258b4
parent 3014a156b84a468e606d45479c584e622b4f1009

Snap for 7796944 from 3014a156b84a468e606d45479c584e622b4f1009 to tm-release

Change-Id: Ifab7ee36eebc559f711f4d00eacbcde8d6cde1ee

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