Remove superfluous type parameter to PluginLoader

Also cleaned up some comments

bug:32815560

Change-Id: Iabf946f811b59613c849c9cd7941196370706e0f

diff --git a/drm/crypto/1.0/default/CryptoFactory.cpp b/drm/crypto/1.0/default/CryptoFactory.cpp
index e67a990..187d564 100644 (file)
--- a/drm/crypto/1.0/default/CryptoFactory.cpp
+++ b/drm/crypto/1.0/default/CryptoFactory.cpp
@@ -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(

diff --git a/drm/drm/1.0/IDrmPlugin.hal b/drm/drm/1.0/IDrmPlugin.hal
index e847805..2816c8a 100644 (file)
--- a/drm/drm/1.0/IDrmPlugin.hal
+++ b/drm/drm/1.0/IDrmPlugin.hal
@@ -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.

diff --git a/drm/drm/1.0/default/DrmFactory.cpp b/drm/drm/1.0/default/DrmFactory.cpp
index 494ca53..7dc7ffe 100644 (file)
--- a/drm/drm/1.0/default/DrmFactory.cpp
+++ b/drm/drm/1.0/default/DrmFactory.cpp
@@ -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 (

diff --git a/drm/drm/1.0/types.hal b/drm/drm/1.0/types.hal
index 3d77911..b2f3f32 100644 (file)
--- a/drm/drm/1.0/types.hal
+++ b/drm/drm/1.0/types.hal
@@ -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,