commit 4ca45b35fff85f3b7b90039891c30473e69703f4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:47:45 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:47:45 2022 +0000
tree 49cfc4d8344e7015c625f74f9cf31d83d6283bec
parent 7f4ea29180dda2baeb4e22c944a4923a3b8eac1b
parent 36c12adb64a92ef420d5c61bbb1813b921f86d40

Snap for 8730993 from 36c12adb64a92ef420d5c61bbb1813b921f86d40 to mainline-tzdata3-release

Change-Id: I00611af4e76b9b636d77ef2e87f468470b7f846b

library/src/androidx/multidex/MultiDex.java

diff --git a/library/src/androidx/multidex/MultiDex.java b/library/src/androidx/multidex/MultiDex.java
index ae4e558..c038709 100644
--- a/library/src/androidx/multidex/MultiDex.java
+++ b/library/src/androidx/multidex/MultiDex.java
@@ -117,12 +117,9 @@
                     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);
+            throw new RuntimeException("MultiDex installation failed (" + e.getMessage() + ").");
         }
         Log.i(TAG, "install done");
     }
@@ -184,12 +181,9 @@
                     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);
+            throw new RuntimeException("MultiDex installation failed (" + e.getMessage() + ").");
         }
         Log.i(TAG, "Installation done");
     }