Camera: VTS: initialize camera statuses after callback registration

For BasicCameraLifeCycleTest, callback registration returns the initial
camera statuses. Need to update the cameraId->status map accordingly.

In addition, fix the camera availability check by comparing against
PRESENT, and all other states are considered unavailable/not-present.

Test: atest VtsAidlCameraServiceTargetTest; vendor testing
Bug: 281777503
Change-Id: I4a76a3d54a5a94b99d628424264d6ffed65f8cbf

1 files changed, 5 insertions, 4 deletions

diff --git a/cameraservice/vts/functional/VtsAidlCameraServiceTargetTest.cpp b/cameraservice/vts/functional/VtsAidlCameraServiceTargetTest.cpp
index 35e7ce2..9b5eab9 100644
--- a/cameraservice/vts/functional/VtsAidlCameraServiceTargetTest.cpp
+++ b/cameraservice/vts/functional/VtsAidlCameraServiceTargetTest.cpp
@@ -106,12 +106,12 @@ class CameraServiceListener : public BnCameraServiceListener {
         EXPECT_NE(mCameraStatuses.find(in_cameraId), mCameraStatuses.end());
         EXPECT_EQ(mCameraStatuses[in_cameraId], CameraDeviceStatus::STATUS_PRESENT);
 
-        if (in_status == CameraDeviceStatus::STATUS_NOT_PRESENT) {
-            auto res = mUnavailablePhysicalCameras[in_cameraId].emplace(in_physicalCameraId);
-            EXPECT_TRUE(res.second);
-        } else {
+        if (in_status == CameraDeviceStatus::STATUS_PRESENT) {
             auto res = mUnavailablePhysicalCameras[in_cameraId].erase(in_physicalCameraId);
             EXPECT_EQ(res, 1);
+        } else {
+            auto res = mUnavailablePhysicalCameras[in_cameraId].emplace(in_physicalCameraId);
+            EXPECT_TRUE(res.second);
         }
         return ndk::ScopedAStatus::ok();
     }
@@ -368,6 +368,7 @@ class VtsAidlCameraServiceTargetTest : public ::testing::TestWithParam<std::stri
 
         ndk::ScopedAStatus ret = mCameraService->addListener(listener, &cameraStatuses);
         EXPECT_TRUE(ret.isOk());
+        listener->initializeStatuses(cameraStatuses);
 
         for (const auto& it : cameraStatuses) {
             CameraMetadata rawMetadata;