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

drm/aidl/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ aidl_interface {
		stability: "vintf",
		imports: [
		"android.hardware.common-V2",
		"android.hardware.drm.common-V1",
		],
		backend: {
		cpp: {
		@@ -30,7 +31,10 @@ aidl_interface {
		versions_with_info: [
		{
		version: "1",
		imports: ["android.hardware.common-V2"],
		imports: [
		"android.hardware.common-V2",
		"android.hardware.drm.common-V1",
		],
		},
		],

+1 −0

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

+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 = 0,
		KEY_NEEDED = 1,
		KEY_EXPIRED = 2,
		VENDOR_DEFINED = 3,
		SESSION_RECLAIMED = 4,
		PROVISION_REQUIRED,
		KEY_NEEDED,
		KEY_EXPIRED,
		VENDOR_DEFINED,
		SESSION_RECLAIMED,
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -34,10 +34,10 @@
		package android.hardware.drm;
		@Backing(type="int") @VintfStability
		enum KeyRequestType {
		INITIAL = 0,
		RENEWAL = 1,
		RELEASE = 2,
		UNKNOWN = 3,
		NONE = 4,
		UPDATE = 5,
		INITIAL,
		RENEWAL,
		RELEASE,
		UNKNOWN,
		NONE,
		UPDATE,
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -34,10 +34,10 @@
		package android.hardware.drm;
		@Backing(type="int") @VintfStability
		enum KeyStatusType {
		USABLE = 0,
		EXPIRED = 1,
		OUTPUT_NOT_ALLOWED = 2,
		STATUS_PENDING = 3,
		INTERNAL_ERROR = 4,
		USABLE_IN_FUTURE = 5,
		USABLE,
		EXPIRED,
		OUTPUT_NOT_ALLOWED,
		STATUS_PENDING,
		INTERNAL_ERROR,
		USABLE_IN_FUTURE,
		}