diff options
| author | 2020-07-28 18:47:37 +0000 | |
|---|---|---|
| committer | 2020-07-28 18:47:37 +0000 | |
| commit | f846f3e206d8fad4ed66e248abd638b67b853b58 (patch) | |
| tree | 96f87eccffe4a59849cff6e40da1fd7a358dc37a | |
| parent | d1de9927ad32561f63980c6222b3a1a86b69ecb6 (diff) | |
| parent | 93bdd4451af0b493ca2b87839ded21a4d259633c (diff) | |
Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp am: 31457aebae am: 93bdd4451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12244505
Change-Id: I22b494e17c1784df81e8620eb032a73676784d79
| -rw-r--r-- | api/module-lib-current.txt | 5 | ||||
| -rw-r--r-- | core/java/android/os/Parcelable.java | 3 | ||||
| -rw-r--r-- | non-updatable-api/module-lib-current.txt | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index e77d750cbffb..85832caa07fe 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -45,6 +45,11 @@ package android.os { method public final void markVintfStability(); } + public interface Parcelable { + field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0 + field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1 + } + public class StatsFrameworkInitializer { method public static void registerServiceWrappers(); method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager); diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java index bedbba04255e..3d3759e695e0 100644 --- a/core/java/android/os/Parcelable.java +++ b/core/java/android/os/Parcelable.java @@ -17,6 +17,7 @@ package android.os; import android.annotation.IntDef; +import android.annotation.SystemApi; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -119,6 +120,7 @@ public interface Parcelable { * @see ParcelableHolder * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final int PARCELABLE_STABILITY_LOCAL = 0x0000; /** * Something that is meant to be used between system and vendor. @@ -126,6 +128,7 @@ public interface Parcelable { * @see ParcelableHolder * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public static final int PARCELABLE_STABILITY_VINTF = 0x0001; /** diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 116549d2c24b..475ecc16cacf 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -5,6 +5,11 @@ package android.os { method public final void markVintfStability(); } + public interface Parcelable { + field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0 + field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1 + } + public class StatsServiceManager { method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer(); method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer(); |