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

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

Browse Source 
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
This commit is contained in:
Arc Wang
2020-03-24 07:46:26 +00:00
committed by Automerger Merge Worker
parent 0a5211a6d5 e4b0989766
commit e446e42d63
3 changed files with 122 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.