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

Commit f0f09819 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove code for feature_combination_query" into main

parents 35f2389e 1599d4be

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+63 −72
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ TEST_P(CameraAidlTest, getCameraCharacteristics) { 
}



TEST_P(CameraAidlTest, getSessionCharacteristics) {

    if (flags::feature_combination_query()) {

    std::vector<std::string> cameraDeviceNames = getCameraDeviceNames(mProvider);



    for (const auto& name : cameraDeviceNames) {
@@ -310,12 +309,10 @@ TEST_P(CameraAidlTest, getSessionCharacteristics) { 
        }



        CameraMetadata meta;

            openEmptyDeviceSession(name, mProvider, &mSession /*out*/, &meta /*out*/,

                                   &device /*out*/);

        openEmptyDeviceSession(name, mProvider, &mSession /*out*/, &meta /*out*/, &device /*out*/);



        std::vector<AvailableStream> outputStreams;

            camera_metadata_t* staticMeta =

                    reinterpret_cast<camera_metadata_t*>(meta.metadata.data());

        camera_metadata_t* staticMeta = reinterpret_cast<camera_metadata_t*>(meta.metadata.data());

        outputStreams.clear();

        ASSERT_EQ(Status::OK, getAvailableOutputStreams(staticMeta, outputStreams));

        ASSERT_NE(0u, outputStreams.size());
@@ -356,10 +353,6 @@ TEST_P(CameraAidlTest, getSessionCharacteristics) { 
        mSession = nullptr;

        ASSERT_TRUE(ret.isOk());

    }

    } else {

        ALOGI("getSessionCharacteristics: Test skipped.\n");

        GTEST_SKIP();

    }

}



// Verify that the torch strength level can be set and retrieved successfully.
@@ -615,7 +608,6 @@ TEST_P(CameraAidlTest, constructDefaultRequestSettings) { 
                ASSERT_EQ(0u, rawMetadata.metadata.size());

            }



            if (flags::feature_combination_query()) {

            if (supportFeatureCombinationQuery) {

                CameraMetadata rawMetadata2;

                ndk::ScopedAStatus ret2 =
@@ -630,7 +622,6 @@ TEST_P(CameraAidlTest, constructDefaultRequestSettings) { 
                }

            }

        }

        }

        ret = mSession->close();

        mSession = nullptr;

        ASSERT_TRUE(ret.isOk());

camera/provider/aidl/vts/camera_aidl_test.cpp

+9 −15
Original line number Diff line number Diff line
@@ -1920,7 +1920,6 @@ void CameraAidlTest::verifyStreamCombination(const std::shared_ptr<ICameraDevice 
        ASSERT_TRUE(ret.isOk());

        ASSERT_EQ(expectedStatus, streamCombinationSupported);



        if (flags::feature_combination_query()) {

        int32_t interfaceVersion;

        ret = device->getInterfaceVersion(&interfaceVersion);

        ASSERT_TRUE(ret.isOk());
@@ -1934,14 +1933,9 @@ void CameraAidlTest::verifyStreamCombination(const std::shared_ptr<ICameraDevice 
        }

    }

}

}



void CameraAidlTest::verifySessionCharacteristics(const CameraMetadata& session_chars,

                                                  const CameraMetadata& camera_chars) {

    if (!flags::feature_combination_query()) {

        return;

    }



    const camera_metadata_t* session_metadata =

            reinterpret_cast<const camera_metadata_t*>(session_chars.metadata.data());