commit 37c169987fb65be91f13b6ad5a0eedce58b77a12
author Robert Shih <robertshih@google.com> Mon Jan 30 19:58:35 2023 +0000
committer Robert Shih <robertshih@google.com> Wed Feb 01 19:17:13 2023 +0000
tree 733d36704d8026fe7aed7473c3f0b03124fe9883
parent 6fa1c89b990d64053743a8b151b0453304e9bc31

Fix DrmMetricsLogger uuid copy size

Bug: 260066511
Test: adb shell dumpsys media.metrics | grep mediadrm
Change-Id: I306facb3c43391e8ac4980961ae3ed6e3abfe84e

drm/libmediadrm/DrmMetricsLogger.cpp

diff --git a/drm/libmediadrm/DrmMetricsLogger.cpp b/drm/libmediadrm/DrmMetricsLogger.cpp
index f7653ff..89b1dcc 100644
--- a/drm/libmediadrm/DrmMetricsLogger.cpp
+++ b/drm/libmediadrm/DrmMetricsLogger.cpp
@@ -33,6 +33,7 @@
     std::vector<uint8_t> vec(sessionKey, sessionKey + sessionId.size());
     return vec;
 }
+
 }  // namespace
 
 DrmMetricsLogger::DrmMetricsLogger(IDrmFrontend frontend)
@@ -48,7 +49,8 @@
     return status;
 }
 
-DrmStatus DrmMetricsLogger::isCryptoSchemeSupported(const uint8_t uuid[16], const String8& mimeType,
+DrmStatus DrmMetricsLogger::isCryptoSchemeSupported(const uint8_t uuid[IDRM_UUID_SIZE],
+                                                    const String8& mimeType,
                                                     DrmPlugin::SecurityLevel securityLevel,
                                                     bool* result) {
     DrmStatus status = mImpl->isCryptoSchemeSupported(uuid, mimeType, securityLevel, result);
@@ -58,8 +60,9 @@
     return status;
 }
 
-DrmStatus DrmMetricsLogger::createPlugin(const uint8_t uuid[16], const String8& appPackageName) {
-    std::memcpy(mUuid.data(), uuid, mUuid.size());
+DrmStatus DrmMetricsLogger::createPlugin(const uint8_t uuid[IDRM_UUID_SIZE],
+                                         const String8& appPackageName) {
+    std::memcpy(mUuid.data(), uuid, IDRM_UUID_SIZE);
     if (kUuidSchemeMap.count(mUuid)) {
         mScheme = kUuidSchemeMap.at(mUuid);
     } else {

drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h

diff --git a/drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h b/drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h
index d2e9a56..f4e3c3e 100644
--- a/drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h
+++ b/drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h
@@ -39,10 +39,13 @@
 
     virtual DrmStatus initCheck() const;
 
-    virtual DrmStatus isCryptoSchemeSupported(const uint8_t uuid[16], const String8& mimeType,
-                                              DrmPlugin::SecurityLevel securityLevel, bool* result);
+    virtual DrmStatus isCryptoSchemeSupported(const uint8_t uuid[IDRM_UUID_SIZE],
+                                              const String8& mimeType,
+                                              DrmPlugin::SecurityLevel securityLevel,
+                                              bool* result);
 
-    virtual DrmStatus createPlugin(const uint8_t uuid[16], const String8& appPackageName);
+    virtual DrmStatus createPlugin(const uint8_t uuid[IDRM_UUID_SIZE],
+                                   const String8& appPackageName);
 
     virtual DrmStatus destroyPlugin();
 

drm/libmediadrm/include/mediadrm/IDrm.h

diff --git a/drm/libmediadrm/include/mediadrm/IDrm.h b/drm/libmediadrm/include/mediadrm/IDrm.h
index f37d1d1..ff5f63b 100644
--- a/drm/libmediadrm/include/mediadrm/IDrm.h
+++ b/drm/libmediadrm/include/mediadrm/IDrm.h
@@ -24,6 +24,8 @@
 
 #define ANDROID_IDRM_H_
 
+#define IDRM_UUID_SIZE (16)
+
 namespace android {
 namespace hardware {
 namespace drm {