commit 1fd47b29b3f06fe032c57f809b494e1599f50194
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 25 18:53:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 25 18:53:59 2017 +0000
tree 1293d7d99cce54e0c33fa61e025eff9ddb261be3
parent 12d67e3c7a9b8caaf2ec4d74598aca9f35405e84
parent a33256b811e29cd8887c00b671cee1ef5f6de8f8

Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev

drm/1.0/vts/functional/drm_hal_clearkey_test.cpp

diff --git a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
index 71b893a..04f2658 100644
--- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp
@@ -129,6 +129,7 @@
  */
 TEST_F(DrmHalClearkeyFactoryTest, EmptyPluginUUIDNotSupported) {
     hidl_array<uint8_t, 16> emptyUUID;
+    memset(emptyUUID.data(), 0, 16);
     EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));
     EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));
 }

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
index ec73a7d..33fb6fb 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -190,6 +190,7 @@
  */
 TEST_P(DrmHalVendorFactoryTest, EmptyPluginUUIDNotSupported) {
     hidl_array<uint8_t, 16> emptyUUID;
+    memset(emptyUUID.data(), 0, 16);
     EXPECT_FALSE(drmFactory->isCryptoSchemeSupported(emptyUUID));
     EXPECT_FALSE(cryptoFactory->isCryptoSchemeSupported(emptyUUID));
 }