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

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

Snap for 6520975 from 333d6c54 to mainline-release 

Change-Id: I9472c7f0e76cb613cb9aafa098e9790c311f4a9d
parents bd3f4f8e 333d6c54

common/aidl/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:platform",

                "com.android.media.swcodec",

            ],

            min_sdk_version: "29",

        },

    },

    versions: ["1"],

}

graphics/common/aidl/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:platform",

                "com.android.media.swcodec",

            ],

            min_sdk_version: "29",

        },

    },

    versions: ["1"],

}

wifi/1.4/default/tests/mock_wifi_iface_util.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ class MockWifiIfaceUtil : public WifiIfaceUtil { 
                 void(const std::string&, IfaceEventHandlers));

    MOCK_METHOD1(unregisterIfaceEventHandlers, void(const std::string&));

    MOCK_METHOD2(setUpState, bool(const std::string&, bool));

    MOCK_METHOD1(ifNameToIndex, unsigned(const std::string&));

};

}  // namespace iface_util

}  // namespace implementation

wifi/1.4/default/tests/wifi_chip_unit_tests.cpp

+2 −0
Original line number Diff line number Diff line
@@ -787,6 +787,8 @@ TEST_F(WifiChipV2_AwareIfaceCombinationTest, CreateNanWithDedicatedNanIface) { 
    property_set("wifi.aware.interface", "aware0");

    findModeAndConfigureForIfaceType(IfaceType::STA);

    ASSERT_EQ(createIface(IfaceType::STA), "wlan0");

    EXPECT_CALL(*iface_util_, ifNameToIndex("aware0"))

        .WillOnce(testing::Return(4));

    EXPECT_CALL(*iface_util_, setUpState("aware0", true))

        .WillOnce(testing::Return(true));

    ASSERT_EQ(createIface(IfaceType::NAN), "aware0");

wifi/1.4/default/wifi_chip.cpp

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <cutils/properties.h>

#include <net/if.h>

#include <sys/stat.h>

#include <sys/sysmacros.h>
@@ -886,7 +885,7 @@ std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::createNanIfaceInternal() { 
    }

    bool is_dedicated_iface = true;

    std::string ifname = getNanIfaceName();

    if (ifname.empty() || if_nametoindex(ifname.c_str())) {

    if (ifname.empty() || !iface_util_.lock()->ifNameToIndex(ifname)) {

        // Use the first shared STA iface (wlan0) if a dedicated aware iface is

        // not defined.

        ifname = getFirstActiveWlanIfaceName();