Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3140fff4 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

resolve merge conflicts of cd02298b to oreo-mr1-vts-dev 

am: 79cea442

Change-Id: I29d89c104f5d476c7c6563b16cf5898a3a213b09
parents f06d4203 79cea442

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -1914,6 +1914,19 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) { 
                    // characteristics keys we've defined.

                    // characteristics keys we've defined.

                    ASSERT_GT(entryCount, 0u);

                    ASSERT_GT(entryCount, 0u);

                    ALOGI("getCameraCharacteristics metadata entry count is %zu", entryCount);

                    ALOGI("getCameraCharacteristics metadata entry count is %zu", entryCount);



                    camera_metadata_ro_entry entry;

                    int retcode = find_camera_metadata_ro_entry(metadata,

                            ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, &entry);

                    if ((0 == retcode) && (entry.count > 0)) {

                        uint8_t hardwareLevel = entry.data.u8[0];

                        ASSERT_TRUE(

                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED ||

                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL ||

                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_3);

                    } else {

                        ADD_FAILURE() << "Get camera hardware level failed!";

                    }

                });

                });

                ASSERT_TRUE(ret.isOk());

                ASSERT_TRUE(ret.isOk());

            }

            }