From 742ceab6f6467c12adbd4d96a0a8bd7a9435557d Mon Sep 17 00:00:00 2001 From: Hongguang Date: Thu, 29 Jul 2021 18:42:13 -0700 Subject: [PATCH] Generate fmq java-source. Add @hide to adil to avoid API export in framework. Bug: 194739778 Test: make and use fmq java-source in framework Change-Id: Ie1f7e8f9a36a1f09258581d484843f372f56e03e Merged-In: Ie1f7e8f9a36a1f09258581d484843f372f56e03e --- common/fmq/aidl/Android.bp | 1 + .../current/android/hardware/common/fmq/GrantorDescriptor.aidl | 1 + .../current/android/hardware/common/fmq/MQDescriptor.aidl | 1 + .../android/hardware/common/fmq/SynchronizedReadWrite.aidl | 1 + .../current/android/hardware/common/fmq/UnsynchronizedWrite.aidl | 1 + .../fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl | 1 + common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl | 1 + .../aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl | 1 + .../aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl | 1 + 9 files changed, 9 insertions(+) diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp index cebf1ce2d2..ad5fab7596 100644 --- a/common/fmq/aidl/Android.bp +++ b/common/fmq/aidl/Android.bp @@ -25,6 +25,7 @@ aidl_interface { backend: { java: { sdk_version: "module_current", + srcs_available: true, }, cpp: { enabled: false, diff --git a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/GrantorDescriptor.aidl b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/GrantorDescriptor.aidl index cf7048bc02..0430c6e65c 100644 --- a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/GrantorDescriptor.aidl +++ b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/GrantorDescriptor.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.common.fmq; +/* @hide */ @VintfStability parcelable GrantorDescriptor { int fdIndex; diff --git a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl index add4b64cf1..ab3af0f5d0 100644 --- a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl +++ b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.common.fmq; +/* @hide */ @VintfStability parcelable MQDescriptor { android.hardware.common.fmq.GrantorDescriptor[] grantors; diff --git a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl index 12c61bab2e..72bab1c6e2 100644 --- a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl +++ b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.common.fmq; +/* @hide */ @VintfStability enum SynchronizedReadWrite { EMPTY = 0, diff --git a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl index f99528d398..f3086881cb 100644 --- a/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl +++ b/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.common.fmq; +/* @hide */ @VintfStability enum UnsynchronizedWrite { EMPTY = 0, diff --git a/common/fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl b/common/fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl index 672415e65a..c6ca470e91 100644 --- a/common/fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl +++ b/common/fmq/aidl/android/hardware/common/fmq/GrantorDescriptor.aidl @@ -18,6 +18,7 @@ package android.hardware.common.fmq; /* * Included in MQDescriptor, for use with libfmq. + * @hide */ @VintfStability parcelable GrantorDescriptor { diff --git a/common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl b/common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl index 46622f00a9..f2fcb313b7 100644 --- a/common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl +++ b/common/fmq/aidl/android/hardware/common/fmq/MQDescriptor.aidl @@ -26,6 +26,7 @@ import android.hardware.common.fmq.GrantorDescriptor; * T - is used to specify the type of the payload * Flavor - is used to specify the type of the queue using * android.hardware.common.SynchronizedReadWrite or UnsynchronizedWrite + * @hide */ @VintfStability parcelable MQDescriptor { diff --git a/common/fmq/aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl b/common/fmq/aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl index 8c334423e0..8b1d0a1177 100644 --- a/common/fmq/aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl +++ b/common/fmq/aidl/android/hardware/common/fmq/SynchronizedReadWrite.aidl @@ -20,6 +20,7 @@ package android.hardware.common.fmq; * For use with android.hardware.common.MQDescriptor to specify which type of * queue to use. SynchronizedReadWrite is single reader, single writer, with no * overflow. All messages written need to be read. + * @hide */ @VintfStability enum SynchronizedReadWrite { diff --git a/common/fmq/aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl b/common/fmq/aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl index 24c4cce74c..5fe48c88d3 100644 --- a/common/fmq/aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl +++ b/common/fmq/aidl/android/hardware/common/fmq/UnsynchronizedWrite.aidl @@ -20,6 +20,7 @@ package android.hardware.common.fmq; * For use with android.hardware.common.MQDescriptor to specify which type of * queue to use. UnsynchronizedWrite is single writer, multiple reader, with * overflow. If messages are not read fast enough, they can be overwritten. + * @hide */ @VintfStability enum UnsynchronizedWrite {