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

Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 5c4a0e3444

Browse Source 
am: b66a8c86a4

Change-Id: I2cfd0376d60efcc5fd417139bfcb3446a2485871
This commit is contained in:
Quang Luong
2019-07-30 17:37:41 -07:00
committed by android-build-merger
parent 2027cdd830 b66a8c86a4
commit a5c8edb46f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -682,8 +682,12 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
}
mMacAddressPref.setVisible(true);
if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
mMacAddressPref.setSummary(R.string.device_info_not_available);
} else {
mMacAddressPref.setSummary(macAddress);
}
}
private String getMacAddress() {
if (mWifiInfo != null) {

2
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -114,7 +114,7 @@ public class WifiDetailPreferenceControllerTest {
private static final int TX_LINK_SPEED = 123;
private static final int RX_LINK_SPEED = 54;
private static final String SSID = "ssid";
private static final String MAC_ADDRESS = WifiInfo.DEFAULT_MAC_ADDRESS;
private static final String MAC_ADDRESS = "01:23:45:67:89:ab";
private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";
private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
private static final String SECURITY = "None";