commit 08685337603dc3d67718c2f55c65a2836f8ebd94
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 28 00:05:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 28 00:05:42 2017 +0000
tree 557b40053ff98fbb64c49cb5d08acb36a08bc132
parent 4414109220efa9e166a084525fec842b3a36103b
parent 8e151bf8999345399208d54663f103921ae5e1c6

Merge "Only construct real Throwable objects." into oc-dev

core/java/android/os/ParcelableException.java

diff --git a/core/java/android/os/ParcelableException.java b/core/java/android/os/ParcelableException.java
index d84d629..7f71905 100644
--- a/core/java/android/os/ParcelableException.java
+++ b/core/java/android/os/ParcelableException.java
@@ -52,10 +52,12 @@
         final String msg = in.readString();
         try {
             final Class<?> clazz = Class.forName(name, true, Parcelable.class.getClassLoader());
-            return (Throwable) clazz.getConstructor(String.class).newInstance(msg);
+            if (Throwable.class.isAssignableFrom(clazz)) {
+                return (Throwable) clazz.getConstructor(String.class).newInstance(msg);
+            }
         } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(name + ": " + msg);
         }
+        return new RuntimeException(name + ": " + msg);
     }
 
     /** {@hide} */