Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 368949c2 authored by Charles Munger's avatar Charles Munger
Browse files

Include exception as cause of BadParcelableException 

Bug: 136208613
Test: Improved error message
Change-Id: I31404ef67f3b3c8788bd5b83ac5db94279f50f7c
parent abc516b9

core/java/android/os/BadParcelableException.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

    }

}

core/java/android/os/Parcel.java

+3 −3
Original line number Diff line number Diff line
@@ -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 "