From 558ba131f962b8e1016f19d74d073d89ad4e0315 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 28 Oct 2022 00:32:53 +0000 Subject: [PATCH] Parcelable: getStability in system API Requirement to use stable AIDL parcelables in priv-apps. Bug: 254476191 Test: aidl_integration_test, build target added which uses this Change-Id: Ib2434e5566bf8bd804f76cf1e63ec1df0e904d77 --- core/api/module-lib-current.txt | 4 ---- core/api/system-current.txt | 2 +- core/java/android/os/Parcelable.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 563ab8149bd18..068b40ad5270e 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -339,10 +339,6 @@ package android.os { method public boolean shouldBypassCache(@NonNull Q); } - public interface Parcelable { - method public default int getStability(); - } - public class Process { method public static final int getAppUidForSdkSandboxUid(int); method public static final boolean isSdkSandboxUid(int); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index e6555ddfa0cf3..dad772abc771d 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9554,6 +9554,7 @@ package android.os { } 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_VINTF = 1; // 0x1 } @@ -9562,7 +9563,6 @@ package android.os { ctor public ParcelableHolder(int); method public int describeContents(); method @Nullable public T getParcelable(@NonNull Class); - method public int getStability(); method public void readFromParcel(@NonNull android.os.Parcel); method public void setParcelable(@Nullable android.os.Parcelable); method public void writeToParcel(@NonNull android.os.Parcel, int); diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java index 8a8045714d46f..a2b0486c1df52 100644 --- a/core/java/android/os/Parcelable.java +++ b/core/java/android/os/Parcelable.java @@ -188,7 +188,7 @@ public interface Parcelable { * @return true if this parcelable is stable. * @hide */ - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @SystemApi(client = SystemApi.Client.PRIVILEGED_APPS) default @Stability int getStability() { return PARCELABLE_STABILITY_LOCAL; }