commit d4dfba423703f15b96f3e2be31c2c95fba0ae4e7
author Cosmo Hsieh <cosmohsieh@google.com> Fri Dec 14 05:15:48 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 14 05:15:48 2018 +0000
tree 0a8fbfd5496758a00cca8240d745af7e981265e9
parent 65b489a8b1ca84cbc075ce32603661e4afa1c56e
parent 18e3692ea369913b1c6639d316c5e4c8f8070807

Merge "Remove bug id for WiFi MAC randomization since feature is ready."

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2e3b76a..67f59ea 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -279,7 +279,7 @@
                 mHiddenSettingsSpinner.setSelection(config.hiddenSSID
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
-                //TODO(b/117957974): set MAC randomization value to mPrivacySettingsSpinner
+                mPrivacySettingsSpinner.setSelection(config.macRandomizationSetting);
                 if (config.getIpAssignment() == IpAssignment.STATIC) {
                     mIpSettingsSpinner.setSelection(STATIC_IP);
                     showAdvancedFields = true;
@@ -759,7 +759,7 @@
         }
 
         if (mPrivacySettingsSpinner != null) {
-            //TODO(b/117957974): set MAC randomization value to WifiConfiguration
+            config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition();
         }
 
         return config;