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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-15 20:17:11 +00:00
committed by Android (Google) Code Review
parent 52af675d14 be959695e3
commit e2dae8c258
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

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