From e5bd46e639d1e5e1e5ea4ba5eb1a88026593e26e Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 28 Jul 2020 01:18:42 +0000
Subject: [PATCH] Allow module libs to use VINTF AIDL (part II)

Allow parcelables to be compiled which report VINTF stability.

Bug: 161501127
Test: atest aidl_integration_test
Change-Id: Idc2acb28ac0475ee69385487c7ef619951f93516
---
 api/module-lib-current.txt               | 5 +++++
 core/java/android/os/Parcelable.java     | 3 +++
 non-updatable-api/module-lib-current.txt | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index e77d750cbffbb..85832caa07fea 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -45,6 +45,11 @@ 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
+  }
+
   public class StatsFrameworkInitializer {
     method public static void registerServiceWrappers();
     method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager);
diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java
index bedbba04255e5..3d3759e695e0d 100644
--- a/core/java/android/os/Parcelable.java
+++ b/core/java/android/os/Parcelable.java
@@ -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;
 
     /**
diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt
index 116549d2c24b5..475ecc16cacf5 100644
--- a/non-updatable-api/module-lib-current.txt
+++ b/non-updatable-api/module-lib-current.txt
@@ -5,6 +5,11 @@ 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
+  }
+
   public class StatsServiceManager {
     method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
     method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();