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

Commit 4f82d590 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5743241 from 6857687e to qt-c2f2-release 

Change-Id: I32a8b75f3618ee03074eaec3045e8f470304a1b4
parents e4702cc8 6857687e

drm/1.1/vts/functional/drm_hal_clearkey_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <android/hardware/drm/1.0/types.h>

#include <android/hardware/drm/1.1/types.h>

#include <android/hidl/allocator/1.0/IAllocator.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <android/hidl/manager/1.2/IServiceManager.h>

#include <gtest/gtest.h>

#include <hidl/HidlSupport.h>

#include <hidl/ServiceManagement.h>
@@ -129,9 +129,9 @@ public: 
        ALOGD("DrmHalClearkeyTest: Running test %s.%s", test_info->test_case_name(),

                test_info->name());



        auto manager = android::hardware::defaultServiceManager();

        auto manager = android::hardware::defaultServiceManager1_2();

        ASSERT_NE(nullptr, manager.get());

        manager->listByInterface(IDrmFactory::descriptor,

        manager->listManifestByInterface(IDrmFactory::descriptor,

                [&](const hidl_vec<hidl_string> &registered) {

                    for (const auto &instance : registered) {

                        sp<IDrmFactory> drmFactory =
@@ -144,7 +144,7 @@ public: 
                }

            );



        manager->listByInterface(ICryptoFactory::descriptor,

        manager->listManifestByInterface(ICryptoFactory::descriptor,

                [&](const hidl_vec<hidl_string> &registered) {

                    for (const auto &instance : registered) {

                        sp<ICryptoFactory> cryptoFactory =

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+11 −4
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 


using android::hardware::hidl_vec;



using IGnssMeasurement_1_0 = android::hardware::gnss::V1_0::IGnssMeasurement;

using IGnssMeasurement_1_1 = android::hardware::gnss::V1_1::IGnssMeasurement;



using android::hardware::gnss::V1_0::GnssConstellationType;

using android::hardware::gnss::V1_0::GnssLocation;

using android::hardware::gnss::V1_0::IGnssDebug;
@@ -43,11 +46,15 @@ TEST_F(GnssHalTest, SetupTeardownCreateCleanup) {} 
 * Gets the GnssMeasurementExtension and verify that it returns an actual extension.

 */

TEST_F(GnssHalTest, TestGnssMeasurementCallback) {

    auto gnssMeasurement = gnss_hal_->getExtensionGnssMeasurement_1_1();

    ASSERT_TRUE(gnssMeasurement.isOk());

    auto gnssMeasurement_1_1 = gnss_hal_->getExtensionGnssMeasurement_1_1();

    ASSERT_TRUE(gnssMeasurement_1_1.isOk());

    auto gnssMeasurement_1_0 = gnss_hal_->getExtensionGnssMeasurement();

    ASSERT_TRUE(gnssMeasurement_1_0.isOk());

    if (last_capabilities_ & IGnssCallback::Capabilities::MEASUREMENTS) {

        sp<IGnssMeasurement> iGnssMeas = gnssMeasurement;

        EXPECT_NE(iGnssMeas, nullptr);

        sp<IGnssMeasurement_1_1> iGnssMeas_1_1 = gnssMeasurement_1_1;

        sp<IGnssMeasurement_1_0> iGnssMeas_1_0 = gnssMeasurement_1_0;

        // At least one interface must be non-null.

        ASSERT_TRUE(iGnssMeas_1_1 != nullptr || iGnssMeas_1_0 != nullptr);

    }

}

nfc/1.2/vts/functional/VtsHalNfcV1_2TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ using ::android::hardware::nfc::V1_2::INfc; 
using ::android::hardware::nfc::V1_2::NfcConfig;



// Range of valid off host route ids

constexpr unsigned int MIN_OFFHOST_ROUTE_ID = 0x80;

constexpr unsigned int MIN_OFFHOST_ROUTE_ID = 0x01;

constexpr unsigned int MAX_OFFHOST_ROUTE_ID = 0xFE;



constexpr char kCallbackNameSendEvent[] = "sendEvent";

wifi/hostapd/1.1/vts/functional/hostapd_hidl_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ class HostapdHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
   protected:

    std::string getPrimaryWlanIfaceName() {

        std::array<char, PROPERTY_VALUE_MAX> buffer;

        auto res = property_get("wifi.sap.interface", buffer.data(), nullptr);

        if (res > 0) return buffer.data();

        property_get("wifi.interface", buffer.data(), "wlan0");

        return buffer.data();

    }