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

Commit 2f831b08 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305 

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



Change-Id: If36533484f1f90c57b6799d086fa5e9b7beba35e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cc1782b a4d51305

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30355,6 +30355,7 @@ package android.os { 
    method public <T extends android.os.Parcelable> void writeTypedArray(@Nullable T[], int);

    method public <T extends android.os.Parcelable> void writeTypedArray(@Nullable T[], int);

    method public <T extends android.os.Parcelable> void writeTypedArrayMap(@Nullable android.util.ArrayMap<java.lang.String,T>, int);

    method public <T extends android.os.Parcelable> void writeTypedArrayMap(@Nullable android.util.ArrayMap<java.lang.String,T>, int);

    method public <T extends android.os.Parcelable> void writeTypedList(@Nullable java.util.List<T>);

    method public <T extends android.os.Parcelable> void writeTypedList(@Nullable java.util.List<T>);

    method public <T extends android.os.Parcelable> void writeTypedList(@Nullable java.util.List<T>, int);

    method public <T extends android.os.Parcelable> void writeTypedObject(@Nullable T, int);

    method public <T extends android.os.Parcelable> void writeTypedObject(@Nullable T, int);

    method public <T extends android.os.Parcelable> void writeTypedSparseArray(@Nullable android.util.SparseArray<T>, int);

    method public <T extends android.os.Parcelable> void writeTypedSparseArray(@Nullable android.util.SparseArray<T>, int);

    method public void writeValue(@Nullable Object);

    method public void writeValue(@Nullable Object);

core/java/android/os/Parcel.java

+14 −1
Original line number Original line Diff line number Diff line
@@ -1999,7 +1999,20 @@ public final class Parcel { 
    }

    }





    /**

    /**

     * @hide

     * Flatten a List containing a particular object type into the parcel, at

     * the current dataPosition() and growing dataCapacity() if needed.  The

     * type of the objects in the list must be one that implements Parcelable.

     * Unlike the generic writeList() method, however, only the raw data of the

     * objects is written and not their type, so you must use the corresponding

     * readTypedList() to unmarshall them.

     *

     * @param val The list of objects to be written.

     * @param parcelableFlags Contextual flags as per

     * {@link Parcelable#writeToParcel(Parcel, int) Parcelable.writeToParcel()}.

     *

     * @see #createTypedArrayList

     * @see #readTypedList

     * @see Parcelable

     */

     */

    public <T extends Parcelable> void writeTypedList(@Nullable List<T> val, int parcelableFlags) {

    public <T extends Parcelable> void writeTypedList(@Nullable List<T> val, int parcelableFlags) {

        if (val == null) {

        if (val == null) {