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

Merge "Include exception as cause of BadParcelableException" am: 9b88b3732d

Browse Source 
Change-Id: I2e79f0c5cef6aab068e290c5682847142c9eb939
This commit is contained in:
Treehugger Robot
2020-04-03 18:51:21 +00:00
committed by Automerger Merge Worker
parent 0075be3fbc 9b88b3732d
commit 2238c3f118
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/BadParcelableException.java
View File

@@ -32,4 +32,8 @@ public class BadParcelableException extends AndroidRuntimeException {
public BadParcelableException(Exception cause) {
super(cause);
}
/** @hide */
public BadParcelableException(String msg, Throwable cause) {
super(msg, cause);
}
}

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

@@ -3044,15 +3044,15 @@ public final class Parcel {
} catch (IllegalAccessException e) {
Log.e(TAG, "Illegal access when unmarshalling: " + name, e);
throw new BadParcelableException(
"IllegalAccessException when unmarshalling: " + name);
"IllegalAccessException when unmarshalling: " + name, e);
} catch (ClassNotFoundException e) {
Log.e(TAG, "Class not found when unmarshalling: " + name, e);
throw new BadParcelableException(
"ClassNotFoundException when unmarshalling: " + name);
"ClassNotFoundException when unmarshalling: " + name, e);
} catch (NoSuchFieldException e) {
throw new BadParcelableException("Parcelable protocol requires a "
+ "Parcelable.Creator object called "
+ "CREATOR on class " + name);
+ "CREATOR on class " + name, e);
}
if (creator == null) {
throw new BadParcelableException("Parcelable protocol requires a "