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

Commit f56195ac authored by Sam Gilbert's avatar Sam Gilbert Committed by Automerger Merge Worker
Browse files

Merge "Fix writeToParcel parameter nullability" am: 55fb62a5 am: 182a0a14... 

Merge "Fix writeToParcel parameter nullability" am: 55fb62a5 am: 182a0a14 am: 12da1633 am: c1775142

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

Change-Id: I8d665456425127c9845ae8ae03995ad4254e8457
parents af394e05 c1775142

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31639,7 +31639,7 @@ package android.os { 














  public interface Parcelable {















    method public int describeContents();













    method public void writeToParcel(android.os.Parcel, int);













    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field public static final int CONTENTS_FILE_DESCRIPTOR = 1; // 0x1















    field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1















  }

























core/java/android/os/Parcelable.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.os;





























import android.annotation.NonNull;















import android.annotation.IntDef;















import android.annotation.SystemApi;


























@@ -202,7 +203,7 @@ public interface Parcelable {













     * @param flags Additional flags about how the object should be written.















     * May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}.















     */













    public void writeToParcel(Parcel dest, @WriteFlags int flags);













    public void writeToParcel(@NonNull Parcel dest, @WriteFlags int flags);































    /**















     * Interface that must be implemented and provided as a public CREATOR