Merge "Allow module libs to use VINTF AIDL." into rvc-dev-plus-aosp am: b9440149be am: 88cab6ba53

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12219679

Change-Id: Ib0a14fb8c6fa5d7de1573b440947164d6b0b2a6a
This commit is contained in:
Steven Moreland
2020-07-24 21:25:52 +00:00
committed by Automerger Merge Worker
3 changed files with 16 additions and 6 deletions

View File

@@ -41,6 +41,10 @@ package android.net {
package android.os { package android.os {
public class Binder implements android.os.IBinder {
method public final void markVintfStability();
}
public class StatsFrameworkInitializer { public class StatsFrameworkInitializer {
method public static void registerServiceWrappers(); method public static void registerServiceWrappers();
method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager); method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager);

View File

@@ -529,15 +529,17 @@ public class Binder implements IBinder {
/** /**
* Mark as being built with VINTF-level stability promise. This API should * 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 * only ever be invoked by generated code from the aidl compiler. It means
* represented by this binder is guaranteed to be kept stable for several * that the interface represented by this binder is guaranteed to be kept
* years, and the build system also keeps snapshots of these APIs and * stable for several years, according to the VINTF compatibility lifecycle,
* invokes the AIDL compiler to make sure that these snapshots are * and the build system also keeps snapshots of these APIs and invokes the
* backwards compatible. Instead of using this API, use an @VintfStability * AIDL compiler to make sure that these snapshots are backwards compatible.
* interface. * Instead of using this API, use the @VintfStability annotation on your
* AIDL interface.
* *
* @hide * @hide
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public final native void markVintfStability(); public final native void markVintfStability();
/** /**

View File

@@ -1,6 +1,10 @@
// Signature format: 2.0 // Signature format: 2.0
package android.os { package android.os {
public class Binder implements android.os.IBinder {
method public final void markVintfStability();
}
public class StatsServiceManager { public class StatsServiceManager {
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer(); method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer(); method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();