Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp am: 31457aebae

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

Change-Id: I9ad6a962366490ba2cc409ea15dc2cda25be650d
This commit is contained in:
Steven Moreland
2020-07-28 18:28:53 +00:00
committed by Automerger Merge Worker
parent 8bd03344c7 31457aebae
commit 93bdd4451a
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/module-lib-current.txt
View File

@@ -45,6 +45,11 @@ package android.os {
method public final void markVintfStability(); 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 { 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);

3
core/java/android/os/Parcelable.java
View File

@@ -17,6 +17,7 @@
package android.os; package android.os;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -119,6 +120,7 @@ public interface Parcelable {
* @see ParcelableHolder * @see ParcelableHolder
* @hide * @hide
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public static final int PARCELABLE_STABILITY_LOCAL = 0x0000; public static final int PARCELABLE_STABILITY_LOCAL = 0x0000;
/** /**
* Something that is meant to be used between system and vendor. * Something that is meant to be used between system and vendor.
@@ -126,6 +128,7 @@ public interface Parcelable {
* @see ParcelableHolder * @see ParcelableHolder
* @hide * @hide
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public static final int PARCELABLE_STABILITY_VINTF = 0x0001; public static final int PARCELABLE_STABILITY_VINTF = 0x0001;
/** /**

5
non-updatable-api/module-lib-current.txt
View File

@@ -5,6 +5,11 @@ package android.os {
method public final void markVintfStability(); 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 { 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();