diff options
| author | android-build-team Robot | 2018-05-03 02:22:53 -0500 |
|---|---|---|
| committer | android-build-team Robot | 2018-05-03 02:22:53 -0500 |
| commit | 16ba7ece2bf05b942d733b5319479bd58ba15298 (patch) | |
| tree | 941a7a744b36a256ff5bdaa0af3af8d3509ce259 | |
| parent | 714ac03d2d355037486eb1f37333cf7f8ffc551c (diff) | |
| parent | 3d5a6411222f0b8b47a16b3442f6417bbff21d28 (diff) | |
| download | platform-hardware-interfaces-16ba7ece2bf05b942d733b5319479bd58ba15298.tar.gz platform-hardware-interfaces-16ba7ece2bf05b942d733b5319479bd58ba15298.tar.xz platform-hardware-interfaces-16ba7ece2bf05b942d733b5319479bd58ba15298.zip | |
Snap for 4759746 from 3d5a6411222f0b8b47a16b3442f6417bbff21d28 to pi-release
Change-Id: I5d935e29154a5a58edaa6146b73a56025f546559
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 637e2808..baffc787 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 @@ hidl_vec<hidl_string> CameraHidlTest::getCameraDeviceNames(sp<ICameraProvider> p | |||
| 1157 | TEST_F(CameraHidlTest, noHal1AfterP) { | 1157 | TEST_F(CameraHidlTest, noHal1AfterP) { |
| 1158 | constexpr int32_t HAL1_PHASE_OUT_API_LEVEL = 28; | 1158 | constexpr int32_t HAL1_PHASE_OUT_API_LEVEL = 28; |
| 1159 | int32_t firstApiLevel = property_get_int32("ro.product.first_api_level", /*default*/-1); | 1159 | int32_t firstApiLevel = property_get_int32("ro.product.first_api_level", /*default*/-1); |
| 1160 | if (firstApiLevel < 0) { | ||
| 1161 | firstApiLevel = property_get_int32("ro.build.version.sdk", /*default*/-1); | ||
| 1162 | } | ||
| 1160 | ASSERT_GT(firstApiLevel, 0); // first_api_level must exist | 1163 | ASSERT_GT(firstApiLevel, 0); // first_api_level must exist |
| 1161 | 1164 | ||
| 1162 | if (firstApiLevel >= HAL1_PHASE_OUT_API_LEVEL) { | 1165 | if (firstApiLevel >= HAL1_PHASE_OUT_API_LEVEL) { |