commit 73d517be5c11ed33682c21122ab1cd901f3ad22e
author Eino-Ville Talvala <etalvala@google.com> Tue Jul 25 21:17:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 21:17:44 2017 +0000
tree b34762c41bae0aa69ddd68856be4efbbbf6752b0
parent d2955e7d3f93d420db8cffe03a71ded923b7452f
parent 4c652d56391f4f7de7ce80aebee8d11227dad1e1

Merge "Camera: Don't enforce result metadata queue support" into oc-dev am: 1d1b503b77
am: 4c652d5639

Change-Id: I4976de2011c05b949ee113dc2a6554a487764d31

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 2ae4853..e078614 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -2909,7 +2909,6 @@
                         }
                     });
                 ASSERT_TRUE(resultQueueRet.isOk());
-                ASSERT_NE(nullptr, resultQueue);
 
                 InFlightRequest inflightReq = {1, false, supportsPartialResults,
                         partialResultCount, resultQueue};
@@ -3185,7 +3184,6 @@
                         }
                     });
                 ASSERT_TRUE(resultQueueRet.isOk());
-                ASSERT_NE(nullptr, resultQueue);
 
                 InFlightRequest inflightReq = {1, false, supportsPartialResults,
                         partialResultCount, resultQueue};