Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f846f3e2 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Allow module libs to use VINTF AIDL (part II)" into rvc-dev-plus-aosp... 

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

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

Change-Id: I22b494e17c1784df81e8620eb032a73676784d79
parents d1de9927 93bdd445

api/module-lib-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/os/Parcelable.java

+3 −0
Original line number Diff line number Diff line
@@ -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;



    /**

non-updatable-api/module-lib-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -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();