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

Display "MAC address is randomized" in Wifi Preference Page

Browse Source 
When Connected MAC Randomization is enabled and the device is
disconnected, there isn't a valid MAC address to display since we don't
know what the device's next MAC address is going to be.

Instead of displaying the MAC address used for previous connection, tell
users that "MAC address is randomized."

Bug: 73663275
Test: make -j40 RunSettingsRoboTests
Change-Id: Id5352926f221e3215734d1c198f2072940f82695
This commit is contained in:
Jong Wook Kim
2018-03-14 00:56:20 -07:00
parent b0f251597c
commit 091894d09d
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/WifiInfoPreferenceController.java
View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.provider.Settings;
import android.support.v4.text.BidiFormatter;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -96,10 +97,18 @@ public class WifiInfoPreferenceController extends AbstractPreferenceController
public void updateWifiInfo() {
if (mWifiMacAddressPref != null) {
final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
final int macRandomizationMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_CONNECTED_MAC_RANDOMIZATION_ENABLED, 0);
final String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
mWifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress)
? macAddress
: mContext.getString(R.string.status_unavailable));
if (TextUtils.isEmpty(macAddress)) {
mWifiMacAddressPref.setSummary(R.string.status_unavailable);
} else if (macRandomizationMode == 1
&& WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {
mWifiMacAddressPref.setSummary(R.string.wifi_status_mac_randomized);
} else {
mWifiMacAddressPref.setSummary(macAddress);
}
}
if (mWifiIpAddressPref != null) {
final String ipAddress = Utils.getWifiIpAddresses(mContext);