Snap for 10109327 from 33767eae00c94086303b9fb685d2bc98c2571033 to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release

Change-Id: I452856ac17845df5903c29b2533e4d2266f35557

2 files changed, 12 insertions, 6 deletions

diff --git a/automotive/powerpolicy/aidl/vts/VtsAidlPowerPolicyTargetTest.cpp b/automotive/powerpolicy/aidl/vts/VtsAidlPowerPolicyTargetTest.cpp
index 402d291..454c3f1 100644
--- a/automotive/powerpolicy/aidl/vts/VtsAidlPowerPolicyTargetTest.cpp
+++ b/automotive/powerpolicy/aidl/vts/VtsAidlPowerPolicyTargetTest.cpp
@@ -21,6 +21,7 @@
 #include <aidl/android/frameworks/automotive/powerpolicy/CarPowerPolicyFilter.h>
 #include <aidl/android/frameworks/automotive/powerpolicy/ICarPowerPolicyServer.h>
 #include <aidl/android/frameworks/automotive/powerpolicy/PowerComponent.h>
+#include <android-base/stringprintf.h>
 #include <android/binder_auto_utils.h>
 #include <android/binder_manager.h>
 #include <android/binder_status.h>
@@ -40,6 +41,7 @@ using ::android::ProcessState;
 using ::android::status_t;
 using ::android::String16;
 using ::android::UNKNOWN_ERROR;
+using ::android::base::StringPrintf;
 using ::ndk::ScopedAStatus;
 using ::ndk::SpAIBinder;
 
@@ -76,9 +78,12 @@ TEST_P(PowerPolicyAidlTest, TestGetCurrentPowerPolicy) {
 TEST_P(PowerPolicyAidlTest, TestGetPowerComponentState) {
     bool state;
     for (const auto componentId : ndk::enum_range<PowerComponent>()) {
+        if (componentId >= PowerComponent::MINIMUM_CUSTOM_COMPONENT_VALUE) {
+            continue;
+        }
         ScopedAStatus status = powerPolicyServer->getPowerComponentState(componentId, &state);
-
-        ASSERT_TRUE(status.isOk());
+        std::string errMsg = StringPrintf("Getting state of component(%d) fails", componentId);
+        ASSERT_TRUE(status.isOk()) << errMsg;
     }
 }
 
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;