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

Revert "Wifi MAC Randomization: Developer Options"

Browse Source 
This reverts commit 8c6d8daaf0.

Reason for revert: <Enabling feature by default. Global flag moved to OEM
configurable overlay instead.>

Bug: 123408542
Test: unit tests
Test: Manual test to verify dev option is gone
Change-Id: Iae667a331b5d4fb4cb6fe07077eb9f3954f3089e
This commit is contained in:
Oscar Shu
2019-01-25 01:16:29 +00:00
committed by xshu
parent 8167b65871
commit 64328862bd
9 changed files with 31 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,12 +98,11 @@ 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 boolean macRandomizationSupported = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_wifi_connected_mac_randomization_supported);
final String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
if (macRandomizationMode == 1
&& WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {
if (macRandomizationSupported && WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {
mWifiMacAddressPref.setSummary(R.string.wifi_status_mac_randomized);
} else if (TextUtils.isEmpty(macAddress)
|| WifiInfo.DEFAULT_MAC_ADDRESS.equals(macAddress)) {