Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix writeToParcel parameter nullability" am: 55fb62a515 am: 182a0a144e am: 12da16335e am: c17751421a

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

Change-Id: I8d665456425127c9845ae8ae03995ad4254e8457
This commit is contained in:
Sam Gilbert
2021-09-30 17:59:55 +00:00
committed by Automerger Merge Worker
parent af394e05a3 c17751421a
commit f56195ac0f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -31639,7 +31639,7 @@ package android.os {
public interface Parcelable { public interface Parcelable {
method public int describeContents(); 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 CONTENTS_FILE_DESCRIPTOR = 1; // 0x1
field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1 field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1
} }

3
core/java/android/os/Parcelable.java
View File

@@ -16,6 +16,7 @@
package android.os; package android.os;
import android.annotation.NonNull;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi; import android.annotation.SystemApi;
@@ -202,7 +203,7 @@ public interface Parcelable {
* @param flags Additional flags about how the object should be written. * @param flags Additional flags about how the object should be written.
* May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}. * 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 * Interface that must be implemented and provided as a public CREATOR