commit 33ad1e6aa19e0bd87c627ffc076066771937c552
author android-build-team Robot <android-build-team-robot@google.com> Thu May 03 17:24:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 17:24:26 2018 +0000
tree 22002bc7cbe661f75708838df67220ad5d61436f
parent 3d5a6411222f0b8b47a16b3442f6417bbff21d28
parent 59dd3df9eb82ee42661172870cbf0e2dd62cf9b5

Merge "Camera: Set partial results in result batcher" into pi-dev

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 637e280..baffc78 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1157,6 +1157,9 @@
 TEST_F(CameraHidlTest, noHal1AfterP) {
     constexpr int32_t HAL1_PHASE_OUT_API_LEVEL = 28;
     int32_t firstApiLevel = property_get_int32("ro.product.first_api_level", /*default*/-1);
+    if (firstApiLevel < 0) {
+        firstApiLevel = property_get_int32("ro.build.version.sdk", /*default*/-1);
+    }
     ASSERT_GT(firstApiLevel, 0); // first_api_level must exist
 
     if (firstApiLevel >= HAL1_PHASE_OUT_API_LEVEL) {