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

Commit 8e3e5647 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6530637 from 723b1d6f to mainline-release 

Change-Id: I7065c6efc08aba92efc9f206e5aeac6cbf68b908
parents 4fc564ea 723b1d6f

gnss/2.0/vts/functional/gnss_hal_test_cases.cpp

+4 −3
Original line number Diff line number Diff line
@@ -223,9 +223,10 @@ TEST_P(GnssHalTest, TestGnssMeasurementFields) { 
                static_cast<uint32_t>(measurement.state) >=

                        static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::

                                                      STATE_UNKNOWN) &&

                static_cast<uint32_t>(measurement.state) <=

                        static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::

                                                      STATE_2ND_CODE_LOCK));

                static_cast<uint32_t>(measurement.state) <

                        (static_cast<uint32_t>(IGnssMeasurementCallback_2_0::GnssMeasurementState::

                                                       STATE_2ND_CODE_LOCK)

                         << 1));

    }



    iGnssMeasurement->close();

neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp

+18 −2
Original line number Diff line number Diff line
@@ -568,8 +568,10 @@ void EvaluatePreparedModel(const sp<IDevice>& device, const sp<IPreparedModel>& 
    }



    Request request = std::move(maybeRequest.value());



    constexpr uint32_t kInsufficientOutputIndex = 0;

    if (testConfig.outputType == OutputType::INSUFFICIENT) {

        makeOutputInsufficientSize(/*outputIndex=*/0, &request);

        makeOutputInsufficientSize(kInsufficientOutputIndex, &request);

    }



    OptionalTimeoutDuration loopTimeoutDuration;
@@ -745,7 +747,21 @@ void EvaluatePreparedModel(const sp<IDevice>& device, const sp<IPreparedModel>& 
            }

            ASSERT_EQ(ErrorStatus::OUTPUT_INSUFFICIENT_SIZE, executionStatus);

            ASSERT_EQ(outputShapes.size(), testModel.main.outputIndexes.size());

            ASSERT_FALSE(outputShapes[0].isSufficient);

            // Check that all returned output dimensions are at least as fully specified as the

            // union of the information about the corresponding operand in the model and in the

            // request. In this test, all model outputs have known rank with all dimensions

            // unspecified, and no dimensional information is provided in the request.

            for (uint32_t i = 0; i < outputShapes.size(); i++) {

                ASSERT_EQ(outputShapes[i].isSufficient, i != kInsufficientOutputIndex);

                const auto& actual = outputShapes[i].dimensions;

                const auto& golden =

                        testModel.main.operands[testModel.main.outputIndexes[i]].dimensions;

                ASSERT_EQ(actual.size(), golden.size());

                for (uint32_t j = 0; j < actual.size(); j++) {

                    if (actual[j] == 0) continue;

                    EXPECT_EQ(actual[j], golden[j]) << "index: " << j;

                }

            }

            return;

        case OutputType::MISSED_DEADLINE:

            ASSERT_TRUE(executionStatus == ErrorStatus::MISSED_DEADLINE_TRANSIENT ||