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

Commit f47f38c9 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "Fix ignored tests in... 

Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b09897

Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
parents d2f98e4d e4b09897

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -2188,8 +2188,6 @@ 
    <string name="wifi_connected_to_message">@string/bluetooth_connected_summary</string>

    <!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->

    <string name="wifi_connecting">Connecting\u2026</string>

    <!-- Button label to disconnect to a Wi-Fi network [CHAR LIMIT=NONE] -->

    <string name="wifi_disconnect">@string/bluetooth_device_context_disconnect</string>

    <!-- Failured notification for connect -->

    <string name="wifi_failed_connect_message">Failed to connect to network</string>

    <!-- Not in range notification for connect [CHAR LIMIT=40] -->

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+4 −17
Original line number Diff line number Diff line
@@ -456,7 +456,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        }

    }



    private void updateNetworkInfo() {

    @VisibleForTesting

    void updateNetworkInfo() {

        if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {

            mNetwork = mWifiManager.getCurrentNetwork();

            mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork);
@@ -632,7 +633,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
    }



    private void refreshMacAddress() {

        String macAddress = getMacAddress();

        String macAddress = mWifiEntry.getMacAddress();

        if (macAddress == null) {

            mMacAddressPref.setVisible(false);

            return;
@@ -649,21 +650,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
        refreshMacTitle();

    }



    private String getMacAddress() {

        if (mWifiEntry.isSaved() && mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {

            return mWifiEntry.getMacAddress();

        }



        // return device MAC address

        final String[] macAddresses = mWifiManager.getFactoryMacAddresses();

        if (macAddresses != null && macAddresses.length > 0) {

            return macAddresses[0];

        }



        Log.e(TAG, "Can't get device MAC address!");

        return null;

    }



    private void updatePreference(Preference pref, String detailText) {

        if (!TextUtils.isEmpty(detailText)) {

            pref.setSummary(detailText);
@@ -969,6 +955,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
     */

    @Override

    public void onUpdated() {

        updateNetworkInfo();

        refreshPage();



        // Refresh the Preferences in fragment.