diff options
| author | 2020-07-24 23:08:32 +0000 | |
|---|---|---|
| committer | 2020-07-24 23:08:32 +0000 | |
| commit | d40462e66d47aaabc125e4e30531fce7b5b9754e (patch) | |
| tree | fb1c68d3e231be01ed99cb9b6c10415abce35db8 | |
| parent | da7e355785c6216e0ade8cbc61a7349d236572ea (diff) | |
| parent | 298d06f29275e71af5dd6ecb7059a9e0a7da4b3c (diff) | |
Merge "Allow module libs to use VINTF AIDL." am: 298d06f292
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371822
Change-Id: I306603dfaacaa1647276bfd4a072a9cfdafb2d3e
| -rw-r--r-- | api/module-lib-current.txt | 8 | ||||
| -rw-r--r-- | core/java/android/os/Binder.java | 14 | ||||
| -rw-r--r-- | non-updatable-api/module-lib-current.txt | 8 |
3 files changed, 24 insertions, 6 deletions
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index 283af068a077..37ee8597651a 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -49,3 +49,11 @@ package android.net { } +package android.os { + + public class Binder implements android.os.IBinder { + method public final void markVintfStability(); + } + +} + diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index f2cf4e3981d3..bf6284347e93 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -505,15 +505,17 @@ public class Binder implements IBinder { /** * Mark as being built with VINTF-level stability promise. This API should - * only ever be invoked by the build system. It means that the interface - * represented by this binder is guaranteed to be kept stable for several - * years, and the build system also keeps snapshots of these APIs and - * invokes the AIDL compiler to make sure that these snapshots are - * backwards compatible. Instead of using this API, use an @VintfStability - * interface. + * only ever be invoked by generated code from the aidl compiler. It means + * that the interface represented by this binder is guaranteed to be kept + * stable for several years, according to the VINTF compatibility lifecycle, + * and the build system also keeps snapshots of these APIs and invokes the + * AIDL compiler to make sure that these snapshots are backwards compatible. + * Instead of using this API, use the @VintfStability annotation on your + * AIDL interface. * * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public final native void markVintfStability(); /** diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 28319242ef2a..107182cc8fcd 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -9,3 +9,11 @@ package android.annotation { } +package android.os { + + public class Binder implements android.os.IBinder { + method public final void markVintfStability(); + } + +} + |