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

Commit 3719bd9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e 

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

Change-Id: I84d065e93e8b7b3b8de3a498304c22f69ca6809d
parents a636ce73 1054fd8e

api/module-lib-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -55,5 +55,10 @@ 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

  }



}

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
@@ -15,5 +15,10 @@ 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

  }



}