diff options
| author | 2020-08-10 21:06:59 +0000 | |
|---|---|---|
| committer | 2020-08-10 21:06:59 +0000 | |
| commit | 6a6e0c282d6585b092921f93231ef61132db3fe2 (patch) | |
| tree | 7433ec86264e77fb54a5d432c73d89f3297134bf | |
| parent | c3e75d31e6fcc17b9163bebe93974fd2ed8f80e2 (diff) | |
| parent | 2b97b696616f9989ae2c47dd1089c6ae52bdd5e3 (diff) | |
Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094 am: 2b97b69661
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003
Change-Id: Ib21378fd78ad3f69c7dc9c4270b35e94b6bd64b2
| -rw-r--r-- | api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Parcelable.java | 1 | ||||
| -rw-r--r-- | non-updatable-api/module-lib-current.txt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index 85832caa07fe..f07f2f34425b 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -46,6 +46,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 } diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java index 3d3759e695e0..f14f66b07630 100644 --- a/core/java/android/os/Parcelable.java +++ b/core/java/android/os/Parcelable.java @@ -161,6 +161,7 @@ public interface Parcelable { * @return true if this parcelable is stable. * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) default @Stability int getStability() { return PARCELABLE_STABILITY_LOCAL; } diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 475ecc16cacf..af959550f9bd 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -6,6 +6,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 } |