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

Commit 296116cf authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Separate hdcp levels into a base interface"" into... 

Merge "Revert "Separate hdcp levels into a base interface"" into android15-tests-dev am: ed1087ed am: 65b88061

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



Change-Id: Ibaa15cc33a7eb0792695f5b398299df0a225754e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a0c28e8 65b88061

drm/aidl/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ aidl_interface { 
    stability: "vintf",

    imports: [

        "android.hardware.common-V2",

        "android.hardware.drm.common-V1",

    ],

    backend: {

        cpp: {
@@ -31,10 +30,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: [

                "android.hardware.common-V2",

                "android.hardware.drm.common-V1",

            ],

            imports: ["android.hardware.common-V2"],

        },

    ],

drm/aidl/aidl_api/android.hardware.drm/1/.hash

+0 −1
Original line number Diff line number Diff line 
7b4b0a0f36a7a6bb22d2016375e4a9d4a033592f
 
3a0197fb44863256da9034c26e721b1eee12d1be

drm/common/aidl/aidl_api/android.hardware.drm.common/1/android/hardware/drm/HdcpLevel.aidl→drm/aidl/aidl_api/android.hardware.drm/1/android/hardware/drm/HdcpLevel.aidl

+8 −8
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 
package android.hardware.drm;

@Backing(type="int") @VintfStability

enum HdcpLevel {

  HDCP_UNKNOWN,

  HDCP_NONE,

  HDCP_V1,

  HDCP_V2,

  HDCP_V2_1,

  HDCP_V2_2,

  HDCP_NO_OUTPUT,

  HDCP_V2_3,

  HDCP_UNKNOWN = 0,

  HDCP_NONE = 1,

  HDCP_V1 = 2,

  HDCP_V2 = 3,

  HDCP_V2_1 = 4,

  HDCP_V2_2 = 5,

  HDCP_NO_OUTPUT = 6,

  HDCP_V2_3 = 7,

}

drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/EventType.aidl

+5 −5
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
package android.hardware.drm;

@Backing(type="int") @VintfStability

enum EventType {

  PROVISION_REQUIRED,

  KEY_NEEDED,

  KEY_EXPIRED,

  VENDOR_DEFINED,

  SESSION_RECLAIMED,

  PROVISION_REQUIRED = 0,

  KEY_NEEDED = 1,

  KEY_EXPIRED = 2,

  VENDOR_DEFINED = 3,

  SESSION_RECLAIMED = 4,

}