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

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

Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d0 am:... 

Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d0 am: 1e169950 am: 2b97b696 am: 6a6e0c28 am: 2cf9b73e

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

Change-Id: I1c3f047476afa6c1e0046cc7012a745fdbd706c3
parents 7be5b55b 2cf9b73e

api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,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

  }

core/java/android/os/Parcelable.java

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public interface Parcelable { 
     * @return true if this parcelable is stable.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    default @Stability int getStability() {

        return PARCELABLE_STABILITY_LOCAL;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,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

  }