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

Commit ce08bacc authored by Hao Ke's avatar Hao Ke Committed by Automerger Merge Worker
Browse files

Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods... 

Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception." am: d6f30611

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857934

Change-Id: Ie91b63142355e26dc5e27216ac9f53a4ebe492d3
parents 63013a44 d6f30611

core/java/android/os/Parcel.java

+15 −7
Original line number Diff line number Diff line
@@ -2891,9 +2891,11 @@ public final class Parcel { 


    /**

     * Same as {@link #readList(List, ClassLoader)} but accepts {@code clazz} parameter as

     * the type required for each item. If the item to be deserialized is not an instance

     * of that class or any of its children class

     * a {@link BadParcelableException} will be thrown.

     * the type required for each item.

     *

     * @throws BadParcelableException Throws BadParcelableException if the item to be deserialized

     * is not an instance of that class or any of its children classes or there was an error

     * trying to instantiate an element.

     */

    public <T> void readList(@NonNull List<? super T> outVal,

            @Nullable ClassLoader loader, @NonNull Class<T> clazz) {
@@ -3894,8 +3896,11 @@ public final class Parcel { 


    /**

     * Same as {@link #readParcelable(ClassLoader)} but accepts {@code clazz} parameter as the type

     * required for each item. If the item to be deserialized is not an instance of that class or

     * any of its children classes a {@link BadParcelableException} will be thrown.

     * required for each item.

     *

     * @throws BadParcelableException Throws BadParcelableException if the item to be deserialized

     * is not an instance of that class or any of its children classes or there was an error

     * trying to instantiate an element.

     */

    @Nullable

    public <T extends Parcelable> T readParcelable(@Nullable ClassLoader loader,
@@ -3961,8 +3966,11 @@ public final class Parcel { 


    /**

     * Same as {@link #readParcelableCreator(ClassLoader)} but accepts {@code clazz} parameter

     * as the required type. If the item to be deserialized is not an instance of that class

     * or any of its children classes a {@link BadParcelableException} will be thrown.

     * as the required type.

     *

     * @throws BadParcelableException Throws BadParcelableException if the item to be deserialized

     * is not an instance of that class or any of its children class or there there was an error

     * trying to read the {@link Parcelable.Creator}.

     */

    @Nullable

    public <T> Parcelable.Creator<T> readParcelableCreator(