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

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

Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev

parents 66208e73 f73d65c9

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -682,8 +682,12 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        }



        mMacAddressPref.setVisible(true);

        if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {

            mMacAddressPref.setSummary(R.string.device_info_not_available);

        } else {

            mMacAddressPref.setSummary(macAddress);

        }

    }



    private String getMacAddress() {

        if (mWifiInfo != null) {

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class WifiDetailPreferenceControllerTest { 
    private static final int TX_LINK_SPEED = 123;

    private static final int RX_LINK_SPEED = 54;

    private static final String SSID = "ssid";

    private static final String MAC_ADDRESS = WifiInfo.DEFAULT_MAC_ADDRESS;

    private static final String MAC_ADDRESS = "01:23:45:67:89:ab";

    private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";

    private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";

    private static final String SECURITY = "None";