Merge "Parcelable: getStability in system API" am: 2681cb2d92 am: afc0bc4c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276108 Change-Id: I9cd97eb28a44c3a62e51709813155d8e5d5c66ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -339,10 +339,6 @@ package android.os {
|
|||||||
method public boolean shouldBypassCache(@NonNull Q);
|
method public boolean shouldBypassCache(@NonNull Q);
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface Parcelable {
|
|
||||||
method public default int getStability();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Process {
|
public class Process {
|
||||||
method public static final int getAppUidForSdkSandboxUid(int);
|
method public static final int getAppUidForSdkSandboxUid(int);
|
||||||
method public static final boolean isSdkSandboxUid(int);
|
method public static final boolean isSdkSandboxUid(int);
|
||||||
|
|||||||
@@ -9554,6 +9554,7 @@ package android.os {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public interface Parcelable {
|
public interface Parcelable {
|
||||||
|
method public default int getStability();
|
||||||
field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0
|
field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0
|
||||||
field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1
|
field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1
|
||||||
}
|
}
|
||||||
@@ -9562,7 +9563,6 @@ package android.os {
|
|||||||
ctor public ParcelableHolder(int);
|
ctor public ParcelableHolder(int);
|
||||||
method public int describeContents();
|
method public int describeContents();
|
||||||
method @Nullable public <T extends android.os.Parcelable> T getParcelable(@NonNull Class<T>);
|
method @Nullable public <T extends android.os.Parcelable> T getParcelable(@NonNull Class<T>);
|
||||||
method public int getStability();
|
|
||||||
method public void readFromParcel(@NonNull android.os.Parcel);
|
method public void readFromParcel(@NonNull android.os.Parcel);
|
||||||
method public void setParcelable(@Nullable android.os.Parcelable);
|
method public void setParcelable(@Nullable android.os.Parcelable);
|
||||||
method public void writeToParcel(@NonNull android.os.Parcel, int);
|
method public void writeToParcel(@NonNull android.os.Parcel, int);
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ public interface Parcelable {
|
|||||||
* @return true if this parcelable is stable.
|
* @return true if this parcelable is stable.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
|
@SystemApi(client = SystemApi.Client.PRIVILEGED_APPS)
|
||||||
default @Stability int getStability() {
|
default @Stability int getStability() {
|
||||||
return PARCELABLE_STABILITY_LOCAL;
|
return PARCELABLE_STABILITY_LOCAL;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user