diff options
| author | Sam Gilbert <sjgilbert@google.com> | 2021-09-30 17:24:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-30 17:24:46 +0000 |
| commit | 182a0a144e8ca775e02e119772ee8beaa3e2ffef (patch) | |
| tree | 2c5499e448e1f1b07affabfa3d79e0774755471d | |
| parent | d60218eb454738577a24dfb0d34b08f0500a6e37 (diff) | |
| parent | 55fb62a515eae80a996fada487cbb33f9aa36702 (diff) | |
Merge "Fix writeToParcel parameter nullability" am: 55fb62a515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533
Change-Id: Ieabc166af0086501cc638cffa7dc6f5960f67172
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Parcelable.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 49a8cb8dbc39..ec20da0cac18 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31588,7 +31588,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 } diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java index a537c98fc497..a3962117279e 100644 --- a/core/java/android/os/Parcelable.java +++ b/core/java/android/os/Parcelable.java @@ -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 |