Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b390ad2d authored by Xin Li's avatar Xin Li
Browse files

Merge pie-vts-dev into master 

Bug: 112170540
Merged-In: I48551f5469289b9fcfc47dd9fd2e455779640329
Change-Id: Icd613751ccf1dc8a0f879525f1d65b11dda7d357
parents 1404b6e8 a8b8b6b1

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+8 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ using ::android::hardware::camera::device::V3_2::ICameraDevice; 
using ::android::hardware::camera::device::V3_2::BufferCache;

using ::android::hardware::camera::device::V3_2::CaptureRequest;

using ::android::hardware::camera::device::V3_2::CaptureResult;

using ::android::hardware::camera::device::V3_2::ICameraDeviceCallback;

using ::android::hardware::camera::device::V3_2::ICameraDeviceSession;

using ::android::hardware::camera::device::V3_2::NotifyMsg;

using ::android::hardware::camera::device::V3_2::RequestTemplate;
@@ -532,7 +531,7 @@ public: 


 hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider);



 struct EmptyDeviceCb : public ICameraDeviceCallback {

 struct EmptyDeviceCb : public V3_4::ICameraDeviceCallback {

     virtual Return<void> processCaptureResult(

         const hidl_vec<CaptureResult>& /*results*/) override {

         ALOGI("processCaptureResult callback");
@@ -540,6 +539,13 @@ public: 
         return Void();

     }



     virtual Return<void> processCaptureResult_3_4(

         const hidl_vec<V3_4::CaptureResult>& /*results*/) override {

         ALOGI("processCaptureResult_3_4 callback");

         ADD_FAILURE();  // Empty callback should not reach here

         return Void();

     }



     virtual Return<void> notify(const hidl_vec<NotifyMsg>& /*msgs*/) override {

         ALOGI("notify callback");

         ADD_FAILURE();  // Empty callback should not reach here

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+8 −7
Original line number Diff line number Diff line
@@ -694,9 +694,10 @@ TEST_F(RadioHidlTest, startLceService) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED,

                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}));

             RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT, RadioError::NONE}));

    }

}
@@ -730,9 +731,9 @@ TEST_F(RadioHidlTest, pullLceData) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::INTERNAL_ERR, RadioError::RADIO_NOT_AVAILABLE},

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::INTERNAL_ERR,

                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT},

                                     CHECK_OEM_ERROR));

    }

}