Merge changes from topic "cas-aidl-frameworks" am: b8e8ab3775 am: 872de78dee

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2329895 Change-Id: I28dfcae7fc7fb6582c6628338561494bb206a93b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2026-02-01 16:50:18 +00:00 · 2022-12-17 03:20:49 +00:00
parent f39ccc440d 872de78dee
commit b9b6a35496
22 changed files with 36 additions and 10 deletions
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/AidlCasPluginDescriptor.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/AidlCasPluginDescriptor.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 parcelable AidlCasPluginDescriptor {
  int caSystemId;
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/DestinationBuffer.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/DestinationBuffer.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 union DestinationBuffer {
  android.hardware.cas.SharedBuffer nonsecureMemory;
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICas.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICas.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 interface ICas {
  void closeSession(in byte[] sessionId);
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICasListener.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICasListener.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 interface ICasListener {
  void onEvent(in int event, in int arg, in byte[] data);
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/IDescrambler.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/IDescrambler.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 interface IDescrambler {
  int descramble(in android.hardware.cas.ScramblingControl scramblingControl, in android.hardware.cas.SubSample[] subSamples, in android.hardware.cas.SharedBuffer srcBuffer, in long srcOffset, in android.hardware.cas.DestinationBuffer dstBuffer, in long dstOffset);
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/IMediaCasService.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/IMediaCasService.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 interface IMediaCasService {
  android.hardware.cas.IDescrambler createDescrambler(in int CA_system_id);
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ScramblingMode.aidl
@@ -44,9 +44,9 @@ enum ScramblingMode {
  DVB_IDSA = 7,
  MULTI2 = 8,
  AES128 = 9,
-  AES_CBC = 10,
-  AES_ECB = 11,
-  AES_SCTE52 = 12,
-  TDES_ECB = 13,
-  TDES_SCTE52 = 14,
+  AES_ECB = 10,
+  AES_SCTE52 = 11,
+  TDES_ECB = 12,
+  TDES_SCTE52 = 13,
+  AES_CBC = 14,
 }
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/SharedBuffer.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/SharedBuffer.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 parcelable SharedBuffer {
  android.hardware.common.Ashmem heapBase;
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/Status.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/Status.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 parcelable Status {
  const int OK = 0;
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/StatusEvent.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/StatusEvent.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@Backing(type="byte") @VintfStability
 enum StatusEvent {
  PLUGIN_PHYSICAL_MODULE_CHANGED = 0,
--- a/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/SubSample.aidl
+++ b/cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/SubSample.aidl
@@ -32,6 +32,7 @@
 // later when a module using the interface is updated, e.g., Mainline modules.

 package android.hardware.cas;
+/* @hide */
@VintfStability
 parcelable SubSample {
  int numBytesOfClearData;
--- a/cas/aidl/android/hardware/cas/AidlCasPluginDescriptor.aidl
+++ b/cas/aidl/android/hardware/cas/AidlCasPluginDescriptor.aidl
@@ -18,6 +18,7 @@ package android.hardware.cas;

 /**
 * Describes a CAS plugin with its system ID and name.
+ * @hide
 */
@VintfStability
 parcelable AidlCasPluginDescriptor {
--- a/cas/aidl/android/hardware/cas/DestinationBuffer.aidl
+++ b/cas/aidl/android/hardware/cas/DestinationBuffer.aidl
@@ -19,6 +19,9 @@ package android.hardware.cas;
 import android.hardware.cas.SharedBuffer;
 import android.hardware.common.NativeHandle;

+/**
+ * @hide
+ */
@VintfStability
 union DestinationBuffer {
    /**
--- a/cas/aidl/android/hardware/cas/ICas.aidl
+++ b/cas/aidl/android/hardware/cas/ICas.aidl
@@ -23,6 +23,7 @@ import android.hardware.cas.SessionIntent;
 * ICas is the API to control the CAS. It is used to manage sessions, provision/refresh the cas
 * system, and process the EMM/ECM messages. It also allows bi-directional, scheme-specific
 * communications between the client and the cas system.
+ * @hide
 */
@VintfStability
 interface ICas {
--- a/cas/aidl/android/hardware/cas/ICasListener.aidl
+++ b/cas/aidl/android/hardware/cas/ICasListener.aidl
@@ -18,6 +18,9 @@ package android.hardware.cas;

 import android.hardware.cas.StatusEvent;

+/**
+ * @hide
+ */
@VintfStability
 interface ICasListener {
    /**
--- a/cas/aidl/android/hardware/cas/IDescrambler.aidl
+++ b/cas/aidl/android/hardware/cas/IDescrambler.aidl
@@ -23,6 +23,7 @@ import android.hardware.cas.SubSample;

 /**
 * IDescrambler is the API to control the descrambling operations.
+ * @hide
 */
@VintfStability
 interface IDescrambler {
--- a/cas/aidl/android/hardware/cas/IMediaCasService.aidl
+++ b/cas/aidl/android/hardware/cas/IMediaCasService.aidl
@@ -26,6 +26,7 @@ import android.hardware.cas.IDescrambler;
 * cas HAL to create cas and descrambler plugin instances. A cas plugin instance
 * opens cas sessions which are used to obtain keys for a descrambler session,
 * which can in turn be used to descramble protected video content.
+ * @hide
 */
@VintfStability
 interface IMediaCasService {
--- a/cas/aidl/android/hardware/cas/ScramblingMode.aidl
+++ b/cas/aidl/android/hardware/cas/ScramblingMode.aidl
@@ -69,11 +69,6 @@ enum ScramblingMode {
     */
    AES128,

-    /**
-     * Advanced Encryption System (AES) Cipher Block Chaining (CBC) mode.
-     */
-    AES_CBC,
-
    /**
     * Advanced Encryption System (AES) Electronic Code Book (ECB) mode.
     */
@@ -95,4 +90,9 @@ enum ScramblingMode {
     * Engineers (SCTE) 52 mode.
     */
    TDES_SCTE52,
+
+    /**
+     * Advanced Encryption System (AES) Cipher Block Chaining (CBC) mode.
+     */
+    AES_CBC,
 }
--- a/cas/aidl/android/hardware/cas/SharedBuffer.aidl
+++ b/cas/aidl/android/hardware/cas/SharedBuffer.aidl
@@ -22,6 +22,7 @@ import android.hardware.common.Ashmem;
 * SharedBuffer describes a shared buffer which is defined by a heapBase, an
 * offset and a size. The offset is relative to the shared memory base for the
 * memory region identified by heapBase.
+ * @hide
 */
@VintfStability
 parcelable SharedBuffer {
--- a/cas/aidl/android/hardware/cas/Status.aidl
+++ b/cas/aidl/android/hardware/cas/Status.aidl
@@ -16,6 +16,9 @@

 package android.hardware.cas;

+/**
+ * @hide
+ */
@VintfStability
 parcelable Status {
    /**
--- a/cas/aidl/android/hardware/cas/StatusEvent.aidl
+++ b/cas/aidl/android/hardware/cas/StatusEvent.aidl
@@ -18,6 +18,7 @@ package android.hardware.cas;

 /**
 * The Event Type for status change.
+ * @hide
 */
@VintfStability
@Backing(type="byte")
--- a/cas/aidl/android/hardware/cas/SubSample.aidl
+++ b/cas/aidl/android/hardware/cas/SubSample.aidl
@@ -19,6 +19,7 @@ package android.hardware.cas;
 /**
 * A subsample consists of some number of bytes of clear (unscrambled)
 * data followed by a number of bytes of scrambled data.
+ * @hide
 */
@VintfStability
 parcelable SubSample {