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

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

Merge "Parcelable: getStability in system API" am: 2681cb2d am: afc0bc4c am: 50223bb6 

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



Change-Id: Ib89fdaf12e9d36aaaff84d2eeaeb834ea180f293
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ba66e9c 50223bb6

core/api/module-lib-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -340,10 +340,6 @@ package android.os { 
    method public boolean shouldBypassCache(@NonNull Q);

  }



  public interface Parcelable {

    method public default int getStability();

  }



  public class Process {

    method public static final int getAppUidForSdkSandboxUid(int);

    method public static final boolean isSdkSandboxUid(int);

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9670,6 +9670,7 @@ package android.os { 
  }















  public interface Parcelable {













    method public default int getStability();















    field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0















    field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1















  }









@@ -9678,7 +9679,6 @@ package android.os {













    ctor public ParcelableHolder(int);















    method public int describeContents();















    method @Nullable public <T extends android.os.Parcelable> T getParcelable(@NonNull Class<T>);













    method public int getStability();















    method public void readFromParcel(@NonNull android.os.Parcel);















    method public void setParcelable(@Nullable android.os.Parcelable);















    method public void writeToParcel(@NonNull android.os.Parcel, int);

























core/java/android/os/Parcelable.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -188,7 +188,7 @@ public interface Parcelable {













     * @return true if this parcelable is stable.















     * @hide















     */













    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)













    @SystemApi(client = SystemApi.Client.PRIVILEGED_APPS)















    default @Stability int getStability() {















        return PARCELABLE_STABILITY_LOCAL;















    }