commit 3d5a6411222f0b8b47a16b3442f6417bbff21d28
author android-build-team Robot <android-build-team-robot@google.com> Wed May 02 21:54:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 21:54:17 2018 +0000
tree 941a7a744b36a256ff5bdaa0af3af8d3509ce259
parent 14bdba8865098afc35515ef73c5f8fa3f9c860ec
parent ccdcb8b60f2c85ad6e81a4e5b053d11952b9d148

Merge "Camera: fix first launch api level logic" 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) {