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

Commit 49ce7d13 authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Automerger Merge Worker
Browse files

Merge "Camera VTS: Fix incorrect return value check" into tm-dev am:... 

Merge "Camera VTS: Fix incorrect return value check" into tm-dev am: 7ab50a86 am: 9a66549f am: e3174f50

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



Change-Id: Ibd055bbe3ec883f8f1fe99728eab3054bacbf406
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 435df054 e3174f50

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+4 −7
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ using ::aidl::android::hardware::camera::device::ICameraDevice; 
using ::aidl::android::hardware::camera::metadata::RequestAvailableDynamicRangeProfilesMap;

using ::aidl::android::hardware::camera::metadata::RequestAvailableDynamicRangeProfilesMap;

using ::aidl::android::hardware::camera::metadata::SensorPixelMode;

using ::aidl::android::hardware::camera::metadata::SensorPixelMode;

using ::aidl::android::hardware::camera::provider::CameraIdAndStreamCombination;

using ::aidl::android::hardware::camera::provider::CameraIdAndStreamCombination;

using ::aidl::android::hardware::camera::provider::ICameraProviderCallbackDefault;

using ::aidl::android::hardware::camera::provider::BnCameraProviderCallback;





using ::ndk::ScopedAStatus;

using ::ndk::ScopedAStatus;
@@ -86,7 +86,7 @@ TEST_P(CameraAidlTest, getVendorTags) { 




// Test if ICameraProvider::setCallback returns Status::OK

// Test if ICameraProvider::setCallback returns Status::OK

TEST_P(CameraAidlTest, setCallback) {

TEST_P(CameraAidlTest, setCallback) {

    struct ProviderCb : public ICameraProviderCallbackDefault {

    struct ProviderCb : public BnCameraProviderCallback {

        ScopedAStatus cameraDeviceStatusChange(const std::string& cameraDeviceName,

        ScopedAStatus cameraDeviceStatusChange(const std::string& cameraDeviceName,

                                               CameraDeviceStatus newStatus) override {

                                               CameraDeviceStatus newStatus) override {

            ALOGI("camera device status callback name %s, status %d", cameraDeviceName.c_str(),

            ALOGI("camera device status callback name %s, status %d", cameraDeviceName.c_str(),
@@ -109,11 +109,11 @@ TEST_P(CameraAidlTest, setCallback) { 
        }

        }

    };

    };





    std::shared_ptr<ProviderCb> cb = ProviderCb::make<ProviderCb>();

    std::shared_ptr<ProviderCb> cb = ndk::SharedRefBase::make<ProviderCb>();

    ScopedAStatus ret = mProvider->setCallback(cb);

    ScopedAStatus ret = mProvider->setCallback(cb);

    ASSERT_TRUE(ret.isOk());

    ASSERT_TRUE(ret.isOk());

    ret = mProvider->setCallback(nullptr);

    ret = mProvider->setCallback(nullptr);

    ASSERT_TRUE(ret.isOk());

    ASSERT_EQ(static_cast<int32_t>(Status::ILLEGAL_ARGUMENT), ret.getServiceSpecificError());

}

}





// Test if ICameraProvider::getCameraDeviceInterface returns Status::OK and non-null device

// Test if ICameraProvider::getCameraDeviceInterface returns Status::OK and non-null device
@@ -399,9 +399,6 @@ TEST_P(CameraAidlTest, setTorchMode) { 
            }

            }

        }

        }

    }

    }



    ret = mProvider->setCallback(nullptr);

    ASSERT_TRUE(ret.isOk());

}

}





// Check dump functionality.

// Check dump functionality.