diff options
| author | 2022-10-31 20:29:28 +0000 | |
|---|---|---|
| committer | 2022-10-31 20:29:28 +0000 | |
| commit | c91eb23d1c3fa2cfbf2ee4ea1e0c1ad752829b3f (patch) | |
| tree | 7fbb5c98c0c7c2d72d8363fd46f3a6f6edfa11f6 | |
| parent | 8ba66e9cfee8772a156f06ea3fbf955766c83648 (diff) | |
| parent | 50223bb6ffda7dd76caf304539915b1f072892cc (diff) | |
Merge "Parcelable: getStability in system API" am: 2681cb2d92 am: afc0bc4c56 am: 50223bb6ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276108
Change-Id: Ib89fdaf12e9d36aaaff84d2eeaeb834ea180f293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/module-lib-current.txt | 4 | ||||
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | 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 88efcced78fb..ce18745046ff 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -340,10 +340,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 a382ecfc99d3..fdb5e071c610 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9670,6 +9670,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 } @@ -9678,7 +9679,6 @@ package android.os { ctor public ParcelableHolder(int); method public int describeContents(); 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 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 8a8045714d46..a2b0486c1df5 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; } |