Merge "Revert "Separate hdcp levels into a base interface"" into android15-tests-dev (ed1087ed) · Commits · e / os / android_hardware_interfaces

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"],
		},
		],

+0 −1

Original line number	Diff line number	Diff line
		7b4b0a0f36a7a6bb22d2016375e4a9d4a033592f
		3a0197fb44863256da9034c26e721b1eee12d1be

+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,
		}

+0 −0

File moved.

+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,
		}