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

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

Snap for 6406367 from fa4bf6f0 to rvc-release 

Change-Id: I5b8bc904808fe48a6dd96ab78ce35553eacfe108
parents 1373688d fa4bf6f0

res_cache.cpp

+15 −2
Original line number Diff line number Diff line
@@ -1938,10 +1938,21 @@ static android::net::NetworkType to_stats_network_type(int32_t mainType, bool wi 
}



android::net::NetworkType convert_network_type(const std::vector<int32_t>& transportTypes) {

    // The valid transportTypes size is either 1 or 2.

    if (transportTypes.size() > 2 || transportTypes.size() == 0) return android::net::NT_UNKNOWN;

    // The valid transportTypes size is 1 to 3.

    if (transportTypes.size() > 3 || transportTypes.size() == 0) return android::net::NT_UNKNOWN;

    // TransportTypes size == 1, map the type to stats network type directly.

    if (transportTypes.size() == 1) return to_stats_network_type(transportTypes[0], false);

    // TransportTypes size == 3, only cellular + wifi + vpn is valid.

    if (transportTypes.size() == 3) {

        std::vector<int32_t> sortedTransTypes = transportTypes;

        std::sort(sortedTransTypes.begin(), sortedTransTypes.end());

        if (sortedTransTypes != std::vector<int32_t>{IDnsResolver::TRANSPORT_CELLULAR,

                                                     IDnsResolver::TRANSPORT_WIFI,

                                                     IDnsResolver::TRANSPORT_VPN}) {

            return android::net::NT_UNKNOWN;

        }

        return android::net::NT_WIFI_CELLULAR_VPN;

    }

    // TransportTypes size == 2, it shoud be 1 main type + vpn type.

    // Otherwise, consider it as UNKNOWN.

    bool hasVpn = false;
@@ -1980,6 +1991,8 @@ static const char* transport_type_to_str(const std::vector<int32_t>& transportTy 
            return "BLUETOOTH_VPN";

        case android::net::NT_ETHERNET_VPN:

            return "ETHERNET_VPN";

        case android::net::NT_WIFI_CELLULAR_VPN:

            return "WIFI_CELLULAR_VPN";

        default:

            return "UNKNOWN";

    }

resolv_cache_unit_test.cpp

+6 −0
Original line number Diff line number Diff line
@@ -883,8 +883,14 @@ TEST_F(ResolvCacheTest, ConvertTransportsToNetworkType) { 
             {IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_LOWPAN}},

            {android::net::NT_UNKNOWN, {}},

            {android::net::NT_UNKNOWN,

             {IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_BLUETOOTH,

              IDnsResolver::TRANSPORT_VPN}},

            {android::net::NT_WIFI_CELLULAR_VPN,

             {IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_WIFI,

              IDnsResolver::TRANSPORT_VPN}},

            {android::net::NT_WIFI_CELLULAR_VPN,

             {IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_WIFI,

              IDnsResolver::TRANSPORT_CELLULAR}},

    };

    for (const auto& config : testConfigs) {

        EXPECT_EQ(config.networkType, convert_network_type(config.transportTypes));