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

Commit 65b7ef02 authored Dec 28, 2016 by Jeff Tinker

Remove superfluous type parameter to PluginLoader

Also cleaned up some comments

bug:32815560

Change-Id: Iabf946f811b59613c849c9cd7941196370706e0f

parent 91393dfc

drm/crypto/1.0/default/CryptoFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ namespace V1_0 {
		namespace implementation {

		CryptoFactory::CryptoFactory() :
		loader("/vendor/lib/mediadrm", "createCryptoFactory", "crypto") {}
		loader("/vendor/lib/mediadrm", "createCryptoFactory") {}

		// Methods from ::android::hardware::drm::crypto::V1_0::ICryptoFactory follow.
		Return<bool> CryptoFactory::isCryptoSchemeSupported(

drm/drm/1.0/IDrmPlugin.hal

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ interface IDrmPlugin {
		* @return status the status of the call. The status must be one of
		* ERROR_DRM_SESSION_NOT_OPENED if the session is not opened,
		* ERROR_DRM_NOT_PROVISIONED if the device requires provisioning before
		* it can generate a key request, ERROR_DRM_CANNOT_HANDLE if keyKeyRequest
		* it can generate a key request, ERROR_DRM_CANNOT_HANDLE if getKeyRequest
		* is not supported at the time of the call, BAD_VALUE if any parameters
		* are invalid or ERROR_DRM_INVALID_STATE if the HAL is in a state where
		* a key request cannot be generated.

drm/drm/1.0/default/DrmFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ namespace V1_0 {
		namespace implementation {

		DrmFactory::DrmFactory() :
		loader("/vendor/lib/mediadrm", "createDrmFactory", "drm") {}
		loader("/vendor/lib/mediadrm", "createDrmFactory") {}

		// Methods from ::android::hardware::drm::drm::V1_0::IDrmFactory follow.
		Return<bool> DrmFactory::isCryptoSchemeSupported (

drm/drm/1.0/types.hal

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ enum EventType : uint32_t {
		enum KeyType : uint32_t {
		/**
		* Drm keys can be for offline content or for online streaming.
		* Offline keys are persisted on the device and may be used when the device

		* is disconnected from the network.
		*/
		OFFLINE,