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

Commit d745cdfe authored by Yixiao Luo's avatar Yixiao Luo Committed by Automerger Merge Worker
Browse files

Merge changes from topic "CAS AIDL Integration" am: 277701b5 am: dee5b24c 

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



Change-Id: I707a6ee3f65b6a42ec598396ce358c5f9b662746
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42cbe6dd dee5b24c

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ package android.hardware.cas; 
@VintfStability

interface ICas {

  void closeSession(in byte[] sessionId);

  byte[] openSessionDefault();

  byte[] openSession(in android.hardware.cas.SessionIntent intent, in android.hardware.cas.ScramblingMode mode);

  void processEcm(in byte[] sessionId, in byte[] ecm);

  void processEmm(in byte[] emm);

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

+14 −14
Original line number Diff line number Diff line
@@ -36,18 +36,18 @@ package android.hardware.cas; 
@Backing(type="int") @VintfStability

enum ScramblingMode {

  RESERVED = 0,

  DVB_CSA1 = 1,

  DVB_CSA2 = 2,

  DVB_CSA3_STANDARD = 3,

  DVB_CSA3_MINIMAL = 4,

  DVB_CSA3_ENHANCE = 5,

  DVB_CISSA_V1 = 6,

  DVB_IDSA = 7,

  MULTI2 = 8,

  AES128 = 9,

  AES_ECB = 10,

  AES_SCTE52 = 11,

  TDES_ECB = 12,

  TDES_SCTE52 = 13,

  AES_CBC = 14,

  DVB_CSA1,

  DVB_CSA2,

  DVB_CSA3_STANDARD,

  DVB_CSA3_MINIMAL,

  DVB_CSA3_ENHANCE,

  DVB_CISSA_V1,

  DVB_IDSA,

  MULTI2,

  AES128,

  AES_ECB,

  AES_SCTE52,

  TDES_ECB,

  TDES_SCTE52,

  AES_CBC,

}

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

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ package android.hardware.cas; 
/* @hide */

@Backing(type="int") @VintfStability

enum SessionIntent {

  LIVE = 0,

  PLAYBACK = 1,

  RECORD = 2,

  TIMESHIFT = 3,

  LIVE,

  PLAYBACK,

  RECORD,

  TIMESHIFT,

}

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

+21 −21
Original line number Diff line number Diff line
@@ -36,25 +36,25 @@ package android.hardware.cas; 
@VintfStability

parcelable Status {

  const int OK = 0;

  const int ERROR_CAS_NO_LICENSE = -1;

  const int ERROR_CAS_LICENSE_EXPIRED = -2;

  const int ERROR_CAS_SESSION_NOT_OPENED = -3;

  const int ERROR_CAS_CANNOT_HANDLE = -4;

  const int ERROR_CAS_INVALID_STATE = -5;

  const int BAD_VALUE = -6;

  const int ERROR_CAS_NOT_PROVISIONED = -7;

  const int ERROR_CAS_RESOURCE_BUSY = -8;

  const int ERROR_CAS_INSUFFICIENT_OUTPUT_PROTECTION = -9;

  const int ERROR_CAS_TAMPER_DETECTED = -10;

  const int ERROR_CAS_DEVICE_REVOKED = -11;

  const int ERROR_CAS_DECRYPT_UNIT_NOT_INITIALIZED = -12;

  const int ERROR_CAS_DECRYPT = -13;

  const int ERROR_CAS_UNKNOWN = -14;

  const int ERROR_CAS_NEED_ACTIVATION = -15;

  const int ERROR_CAS_NEED_PAIRING = -16;

  const int ERROR_CAS_NO_CARD = -17;

  const int ERROR_CAS_CARD_MUTE = -18;

  const int ERROR_CAS_CARD_INVALID = -19;

  const int ERROR_CAS_BLACKOUT = -20;

  const int ERROR_CAS_REBOOTING = -21;

  const int ERROR_CAS_NO_LICENSE = 1;

  const int ERROR_CAS_LICENSE_EXPIRED = 2;

  const int ERROR_CAS_SESSION_NOT_OPENED = 3;

  const int ERROR_CAS_CANNOT_HANDLE = 4;

  const int ERROR_CAS_INVALID_STATE = 5;

  const int BAD_VALUE = 6;

  const int ERROR_CAS_NOT_PROVISIONED = 7;

  const int ERROR_CAS_RESOURCE_BUSY = 8;

  const int ERROR_CAS_INSUFFICIENT_OUTPUT_PROTECTION = 9;

  const int ERROR_CAS_TAMPER_DETECTED = 10;

  const int ERROR_CAS_DEVICE_REVOKED = 11;

  const int ERROR_CAS_DECRYPT_UNIT_NOT_INITIALIZED = 12;

  const int ERROR_CAS_DECRYPT = 13;

  const int ERROR_CAS_UNKNOWN = 14;

  const int ERROR_CAS_NEED_ACTIVATION = 15;

  const int ERROR_CAS_NEED_PAIRING = 16;

  const int ERROR_CAS_NO_CARD = 17;

  const int ERROR_CAS_CARD_MUTE = 18;

  const int ERROR_CAS_CARD_INVALID = 19;

  const int ERROR_CAS_BLACKOUT = 20;

  const int ERROR_CAS_REBOOTING = 21;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ package android.hardware.cas; 
/* @hide */

@Backing(type="byte") @VintfStability

enum StatusEvent {

  PLUGIN_PHYSICAL_MODULE_CHANGED = 0,

  PLUGIN_SESSION_NUMBER_CHANGED = 1,

  PLUGIN_PHYSICAL_MODULE_CHANGED,

  PLUGIN_SESSION_NUMBER_CHANGED,

}