Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev

Browse Source 
am: e2dae8c258

Change-Id: If093cdfdb9ea0a327a5e67dc0dd40facc466de5c
This commit is contained in:
Emilian Peev
2017-08-15 20:27:50 +00:00
committed by android-build-merger
parent f5da927e19 e2dae8c258
commit 4fa40be5ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View File

@@ -1527,8 +1527,8 @@ TEST_F(CameraHidlTest, cancelPicture) {
} }
} }
// Image capture cancel should fail when image capture is not running. // Image capture cancel is a no-op when image capture is not running.
TEST_F(CameraHidlTest, cancelPictureFail) { TEST_F(CameraHidlTest, cancelPictureNOP) {
for (auto provider : CameraHidlEnvironment::Instance()->mProviders) { for (auto provider : CameraHidlEnvironment::Instance()->mProviders) {
hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames( hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(
provider.second); provider.second);
@@ -1547,7 +1547,7 @@ TEST_F(CameraHidlTest, cancelPictureFail) {
Return<Status> returnStatus = device1->cancelPicture(); Return<Status> returnStatus = device1->cancelPicture();
ASSERT_TRUE(returnStatus.isOk()); ASSERT_TRUE(returnStatus.isOk());
ASSERT_NE(Status::OK, returnStatus); ASSERT_EQ(Status::OK, returnStatus);
stopPreviewAndClose(device1); stopPreviewAndClose(device1);
} }