diff options
| author | 2020-08-10 20:47:00 +0000 | |
|---|---|---|
| committer | 2020-08-10 20:47:00 +0000 | |
| commit | 2b97b696616f9989ae2c47dd1089c6ae52bdd5e3 (patch) | |
| tree | 7eef29c27d25a45896f7cafabcf2782fdb8b7a73 | |
| parent | ce3fd2b5095195e605e3754e00c797d809779fdb (diff) | |
| parent | 1e16995094af46608851f2bbf910296701ff0faf (diff) | |
Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003
Change-Id: Ibd396e7b4d12e1765f71413d730d51997c5b4306
| -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 } |