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

Commit fa93b638 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into... 

Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
parents adf64d6c d6651f28

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

+12 −6
Original line number Original line Diff line number Diff line
@@ -607,7 +607,9 @@ public: 




    struct DeviceCb : public V3_5::ICameraDeviceCallback {

    struct DeviceCb : public V3_5::ICameraDeviceCallback {

        DeviceCb(CameraHidlTest *parent, int deviceVersion, const camera_metadata_t *staticMeta) :

        DeviceCb(CameraHidlTest *parent, int deviceVersion, const camera_metadata_t *staticMeta) :

                mParent(parent), mDeviceVersion(deviceVersion), mStaticMetadata(staticMeta) {}

                mParent(parent), mDeviceVersion(deviceVersion) {

            mStaticMetadata = staticMeta;

        }





        Return<void> processCaptureResult_3_4(

        Return<void> processCaptureResult_3_4(

                const hidl_vec<V3_4::CaptureResult>& results) override;

                const hidl_vec<V3_4::CaptureResult>& results) override;
@@ -631,7 +633,7 @@ public: 




        CameraHidlTest *mParent; // Parent object

        CameraHidlTest *mParent; // Parent object

        int mDeviceVersion;

        int mDeviceVersion;

        const camera_metadata_t *mStaticMetadata;

        android::hardware::camera::common::V1_0::helper::CameraMetadata mStaticMetadata;

        bool hasOutstandingBuffersLocked();

        bool hasOutstandingBuffersLocked();





        /* members for requestStreamBuffers() and returnStreamBuffers()*/

        /* members for requestStreamBuffers() and returnStreamBuffers()*/
@@ -1194,18 +1196,20 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r 
        // Verify final result metadata

        // Verify final result metadata

        bool isAtLeast_3_5 = mDeviceVersion >= CAMERA_DEVICE_API_VERSION_3_5;

        bool isAtLeast_3_5 = mDeviceVersion >= CAMERA_DEVICE_API_VERSION_3_5;

        if (isAtLeast_3_5) {

        if (isAtLeast_3_5) {

            auto staticMetadataBuffer = mStaticMetadata.getAndLock();

            bool isMonochrome = Status::OK ==

            bool isMonochrome = Status::OK ==

                    CameraHidlTest::isMonochromeCamera(mStaticMetadata);

                    CameraHidlTest::isMonochromeCamera(staticMetadataBuffer);

            if (isMonochrome) {

            if (isMonochrome) {

                mParent->verifyMonochromeCameraResult(request->collectedResult);

                mParent->verifyMonochromeCameraResult(request->collectedResult);

            }

            }





            // Verify logical camera result metadata

            // Verify logical camera result metadata

            bool isLogicalCamera =

            bool isLogicalCamera =

                    Status::OK == CameraHidlTest::isLogicalMultiCamera(mStaticMetadata);

                    Status::OK == CameraHidlTest::isLogicalMultiCamera(staticMetadataBuffer);

            if (isLogicalCamera) {

            if (isLogicalCamera) {

                mParent->verifyLogicalCameraResult(mStaticMetadata, request->collectedResult);

                mParent->verifyLogicalCameraResult(staticMetadataBuffer, request->collectedResult);

            }

            }

            mStaticMetadata.unlock(staticMetadataBuffer);

        }

        }

    }

    }
@@ -4131,6 +4135,8 @@ TEST_F(CameraHidlTest, processMultiCaptureRequestPreview) { 
                &useHalBufManager /*out*/, &cb /*out*/, 0 /*streamConfigCounter*/,

                &useHalBufManager /*out*/, &cb /*out*/, 0 /*streamConfigCounter*/,

                true /*allowUnsupport*/);

                true /*allowUnsupport*/);

        if (session3_5 == nullptr) {

        if (session3_5 == nullptr) {

            ret = session3_4->close();

            ASSERT_TRUE(ret.isOk());

            continue;

            continue;

        }

        }

compatibility_matrices/compatibility_matrix.current.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -365,7 +365,10 @@ 
    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.radio.config</name>

        <name>android.hardware.radio.config</name>

        <version>1.2</version>

        <!--

        See compatibility_matrix.4.xml on versioning of radio config HAL.

        -->

        <version>1.1</version>

        <interface>

        <interface>

            <name>IRadioConfig</name>

            <name>IRadioConfig</name>

            <instance>default</instance>

            <instance>default</instance>

sensors/2.0/vts/functional/VtsHalSensorsV2_0TargetTest.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -683,11 +683,16 @@ void SensorsHidlTest::runFlushTest(const std::vector<SensorInfo>& sensors, bool 
            Result flushResult = flush(sensor.sensorHandle);

            Result flushResult = flush(sensor.sensorHandle);

            ASSERT_EQ(flushResult, expectedResponse);

            ASSERT_EQ(flushResult, expectedResponse);

        }

        }

        activate(sensor.sensorHandle, false);

    }

    }





    // Wait up to one second for the flush events

    // Wait up to one second for the flush events

    callback.waitForFlushEvents(sensors, flushCalls, 1000 /* timeoutMs */);

    callback.waitForFlushEvents(sensors, flushCalls, 1000 /* timeoutMs */);



    // Deactivate all sensors after waiting for flush events so pending flush events are not

    // abandoned by the HAL.

    for (const SensorInfo& sensor : sensors) {

        activate(sensor.sensorHandle, false);

    }

    getEnvironment()->unregisterCallback();

    getEnvironment()->unregisterCallback();





    // Check that the correct number of flushes are present for each sensor

    // Check that the correct number of flushes are present for each sensor