PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: Id1444c234fb4a0b238fafc02a5f24f880e32d8c4
This commit is contained in:
TreeHugger Robot
2020-06-29 04:40:39 +00:00
committed by Automerger Merge Worker
parent 8793b373be 531dbf5358
commit 5412d4ab3e
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -631,21 +631,23 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
private void refreshMacAddress() {
String macAddress = mWifiEntry.getMacAddress();
if (macAddress == null) {
final String macAddress = mWifiEntry.getMacAddress();
if (TextUtils.isEmpty(macAddress)) {
mMacAddressPref.setVisible(false);
return;
}
mMacAddressPref.setVisible(true);
mMacAddressPref.setTitle((mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC)
? R.string.wifi_advanced_randomized_mac_address_title
: R.string.wifi_advanced_device_mac_address_title);
if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
mMacAddressPref.setSummary(R.string.device_info_not_available);
} else {
mMacAddressPref.setSummary(macAddress);
}
// MAC Address Pref Title
refreshMacTitle();
}
private void updatePreference(Preference pref, String detailText) {
@@ -930,24 +932,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
}
private void refreshMacTitle() {
if (!mWifiEntry.isSaved()) {
return;
}
// For saved Passpoint network, framework doesn't have the field to keep the MAC choice
// persistently, so Passpoint network will always use the default value so far, which is
// randomized MAC address, so don't need to modify title.
if (mWifiEntry.isSubscription()) {
return;
}
mMacAddressPref.setTitle(
(mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC)
? R.string.wifi_advanced_randomized_mac_address_title
: R.string.wifi_advanced_device_mac_address_title);
}
/**
* Indicates the state of the WifiEntry has changed and clients may retrieve updates through
* the WifiEntry getter methods.