Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 872de78d authored Dec 17, 2022 by Treehugger Robot Committed by Automerger Merge Worker Dec 17, 2022

Merge changes from topic "cas-aidl-frameworks" am: b8e8ab37

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2329895

Change-Id: Icd705857ed10d1bcb82ebf83b5f48ee9867618a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 9e6ab249 b8e8ab37

cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/AidlCasPluginDescriptor.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/DestinationBuffer.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICas.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/ICasListener.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

cas/aidl/aidl_api/android.hardware.cas/current/android/hardware/cas/IDescrambler.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);