From a0eb7e415c231b90a507e7758b55075019871b94 Mon Sep 17 00:00:00 2001 From: Ng Zhi An Date: Thu, 27 Sep 2018 16:55:47 -0700 Subject: [PATCH] Skip hal v1 check after p on low ram devices Bug: 116546417 Test: vts-tradefed run commandAndExit vts -m VtsHalCameraProviderV2_4Target -t VtsHalCameraProviderV2_4Target#CameraHidlTest.noHal1AfterP Change-Id: I28782b560975b49e20d6b42d599d689f819a9383 --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 439333d9ca..71b78f492b 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -1172,6 +1172,14 @@ TEST_F(CameraHidlTest, noHal1AfterP) { } ASSERT_GT(firstApiLevel, 0); // first_api_level must exist + // all devices with first API level == 28 and <= 1GB of RAM must set low_ram + // and thus be allowed to continue using HAL1 + if ((firstApiLevel == HAL1_PHASE_OUT_API_LEVEL) && + (property_get_bool("ro.config.low_ram", /*default*/ false))) { + ALOGI("Hal1 allowed for low ram device"); + return; + } + if (firstApiLevel >= HAL1_PHASE_OUT_API_LEVEL) { hidl_vec cameraDeviceNames = getCameraDeviceNames(mProvider); for (const auto& name : cameraDeviceNames) {