commit 2681cb2d92266a1ce16c87f78d7ce24df0e496da
author Steven Moreland <smoreland@google.com> Mon Oct 31 17:39:56 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 31 17:39:56 2022 +0000
tree e3f84568014fe6f6d5d332ae66efc074ea0282d6
parent 095c17d5b85475203407d86c3a447fa83b1dcf2a
parent 558ba131f962b8e1016f19d74d073d89ad4e0315

Merge "Parcelable: getStability in system API"

core/api/module-lib-current.txt

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 563ab81..068b40a 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -339,10 +339,6 @@
     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

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index e6555dd..dad772a 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9554,6 +9554,7 @@
   }
 
   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
   }
@@ -9562,7 +9563,6 @@
     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

diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java
index 8a80457..a2b0486 100644
--- a/core/java/android/os/Parcelable.java
+++ b/core/java/android/os/Parcelable.java
@@ -188,7 +188,7 @@
      * @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;
     }