commit | b95c8638c15f30b910a8de2c58849399cdd5edba | [log] [tgz] |
---|---|---|
author | Yahan Zhou <yahan@google.com> | Wed Jun 28 17:33:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 17:33:39 2017 +0000 |
tree | fe26123644bfad691d92206198cabe8cbf4e0306 | |
parent | 6d600e571c453f298eb407f4d574ad24d85a4b76 [diff] | |
parent | ef38715ba3e84ee35b8cd8c1a793ea55d2371a6f [diff] |
Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17 am: ef38715ba3 Change-Id: Iebc7405f6603c2838ecaa917357eb81a977f140c
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 e2c9cca..67b2c7d 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -128,7 +128,7 @@ // Do the same for the crypto factory cryptoFactory = VtsTestBase::getService<ICryptoFactory>(name); if (cryptoFactory == nullptr) { - VtsTestBase::getService<ICryptoFactory>(); + cryptoFactory = VtsTestBase::getService<ICryptoFactory>(); } ASSERT_NE(cryptoFactory, nullptr);