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

Commit e27e4e3a authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "SettingsLib: Handle WifiService being null" into main am: f7669815... 

Merge "SettingsLib: Handle WifiService being null" into main am: f7669815 am: 362304d0 am: 56c8cb38

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2892020



Change-Id: I5edb99a3dc52b7a68eed6bb424136d6805be781f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ecde092 56c8cb38

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java

+6 −8
Original line number Diff line number Diff line
@@ -70,11 +70,9 @@ public abstract class AbstractWifiMacAddressPreferenceController 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {

        mWifiMacAddress = screen.findPreference(KEY_WIFI_MAC_ADDRESS);

        updateConnectivity();

    }

    }



    @Override

    protected String[] getConnectivityIntents() {
@@ -84,16 +82,16 @@ public abstract class AbstractWifiMacAddressPreferenceController 
    @SuppressLint("HardwareIds")

    @Override

    protected void updateConnectivity() {

        if (mWifiManager == null || mWifiMacAddress == null) {

            return;

        }



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

        String macAddress = null;

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

            macAddress = macAddresses[0];

        }



        if (mWifiMacAddress == null) {

            return;

        }



        if (TextUtils.isEmpty(macAddress) || macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {

            mWifiMacAddress.setSummary(R.string.status_unavailable);

        } else {