Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da

Browse Source 
am: 08415b47b0

Change-Id: I6fac18c8ba18f387b9b864055985b2a6bd12de68
This commit is contained in:
Jeff Sharkey
2017-09-28 00:35:12 +00:00
committed by android-build-merger
parent 7fe00cc2e7 08415b47b0
commit 187b437818
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/ParcelableException.java
View File

@@ -52,10 +52,12 @@ public final class ParcelableException extends RuntimeException implements Parce
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} */