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

Commit b8e8ab37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "cas-aidl-frameworks" 

* changes:
  CAS: Add @hide annotations
  CAS: Update ScramblingMode enum order
parents 7c2b5ed7 b4eb99bd

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);