Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-mr1-dev
This commit is contained in:
commit
fc371311ad
1 changed files with 3 additions and 3 deletions
|
@ -1417,8 +1417,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) {
|
||||
hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);
|
||||
|
||||
for (const auto& name : cameraDeviceNames) {
|
||||
|
@ -1433,7 +1433,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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue