release-request-447544c9-42cd-4c45-a7c6-4f09361c94db-for-git_oc-dr1-release-4277755 snap-temp-L90500000093605838android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I6e8eaeac26ab912a95402cf66575fa0b81d35a73

1 files changed, 3 insertions, 3 deletions

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 3b9d35c3db..6f04efc598 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1527,8 +1527,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);
@@ -1547,7 +1547,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);
             }