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

Commit 743f370d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am:... 

Merge "Camera VTS: Fix AIDL status typo" into android13-tests-dev am: 1c417075 am: 5b1233de am: 25971093

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



Change-Id: Ib3c8621390b37599bc6979827811263a58f6172a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55d86fcb 25971093

camera/provider/aidl/vts/camera_aidl_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ std::vector<std::string> CameraAidlTest::getCameraDeviceNames( 
        ScopedAStatus physicalCameraDeviceStatusChange(

        ScopedAStatus physicalCameraDeviceStatusChange(

                const std::string&, const std::string&,

                const std::string&, const std::string&,

                ::aidl::android::hardware::camera::common::CameraDeviceStatus) override {

                ::aidl::android::hardware::camera::common::CameraDeviceStatus) override {

            return ndk::ScopedAStatus();

            return ScopedAStatus::ok();

        }

        }





        std::vector<std::string> externalCameraDeviceNames;

        std::vector<std::string> externalCameraDeviceNames;