Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (fe96483e) · Commits · e / os / android_frameworks_base

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

+7 −9

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public abstract class AbstractWifiMacAddressPreferenceController

		@Override
		public boolean isAvailable() {
		return true;
		return mWifiManager != null;
		}

		@Override
		@@ -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 {