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

Commit fcf373f1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: VTS: Fail test if availableSettingsOverride is empty" into udc-dev am: 90c8cd9a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22365839



Change-Id: Id03900278c66b850f1c5df308a1b997d02bb47b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b93d612f 90c8cd9a

camera/provider/aidl/vts/camera_aidl_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ void CameraAidlTest::verifySettingsOverrideCharacteristics(const camera_metadata 
    int retcode = find_camera_metadata_ro_entry(metadata,

            ANDROID_CONTROL_AVAILABLE_SETTINGS_OVERRIDES, &entry);

    bool supportSettingsOverride = false;

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

    if (0 == retcode) {

        supportSettingsOverride = true;

        bool hasOff = false;

        for (size_t i = 0; i < entry.count; i++) {