Expose 'ParcelableHolder' as SystemApi

ParcelableHolder is the way to extend already defined parcelables. So,
it's supposed to be used by OEM's modules.

For Parcelable to be used by the OEM's module, it should be exposed as
SystemApi

Bug: 146611855
Test: atest aidl_unittests aidl_integration_test CtsNdkBinderTest
Change-Id: I3d3e3d6b22ffd128dcfc8281d998ee3f55a398c5

2 files changed, 16 insertions, 2 deletions

diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index f07f2f34425b..2f0ae78f7e2d 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -47,8 +47,6 @@ 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
   }
 
   public class StatsFrameworkInitializer {
diff --git a/api/system-current.txt b/api/system-current.txt
index 8db99aa097a7..6475d81067cd 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8350,6 +8350,22 @@ package android.os {
     method public boolean hasSingleFileDescriptor();
   }
 
+  public interface Parcelable {
+    field public static final int PARCELABLE_STABILITY_LOCAL = 0; // 0x0
+    field public static final int PARCELABLE_STABILITY_VINTF = 1; // 0x1
+  }
+
+  public final class ParcelableHolder implements android.os.Parcelable {
+    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 boolean setParcelable(@Nullable android.os.Parcelable);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.os.ParcelableHolder> CREATOR;
+  }
+
   public final class PowerManager {
     method @RequiresPermission(allOf={android.Manifest.permission.READ_DREAM_STATE, android.Manifest.permission.WRITE_DREAM_STATE}) public void dream(long);
     method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean forceSuspend();