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

Commit 27530aba authored by Yixiao Luo's avatar Yixiao Luo Committed by Gerrit Code Review
Browse files

Merge "CAS: Add AIDL Support"

parents 463a0128 3181772b

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ filegroup { 
        ":android.security.maintenance-java-source",

        ":android.security.metrics-java-source",

        ":android.system.keystore2-V3-java-source",

        ":android.hardware.cas-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",

        ":framework_native_aidl",
@@ -196,6 +197,7 @@ java_library { 
        "updatable-driver-protos",

        "ota_metadata_proto_java",

        "android.hidl.base-V1.0-java",

        "android.hardware.cas-V1-java", // AIDL

        "android.hardware.cas-V1.0-java",

        "android.hardware.cas-V1.1-java",

        "android.hardware.cas-V1.2-java",

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21142,6 +21142,7 @@ package android.media { 
    field public static final int PLUGIN_STATUS_PHYSICAL_MODULE_CHANGED = 0; // 0x0

    field public static final int PLUGIN_STATUS_SESSION_NUMBER_CHANGED = 1; // 0x1

    field public static final int SCRAMBLING_MODE_AES128 = 9; // 0x9

    field public static final int SCRAMBLING_MODE_AES_CBC = 14; // 0xe

    field public static final int SCRAMBLING_MODE_AES_ECB = 10; // 0xa

    field public static final int SCRAMBLING_MODE_AES_SCTE52 = 11; // 0xb

    field public static final int SCRAMBLING_MODE_DVB_CISSA_V1 = 6; // 0x6