diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-12 04:39:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-12 04:39:39 -0800 |
| commit | 1b0ef143ec87a08eed44635baefe5de807cefbd4 (patch) | |
| tree | fda901ba4c2a74d4f3e856a3247c014272fffe60 /service/java/com/android/server/wifi/WifiConfigStore.java | |
| parent | 387f56e23635cbfa9c05994aaa07da76e5c2172d (diff) | |
| parent | ae78221ce2fb27dd978ec1f8714389adb9605414 (diff) | |
| download | android_frameworks_opt_net_wifi-1b0ef143ec87a08eed44635baefe5de807cefbd4.tar.gz android_frameworks_opt_net_wifi-1b0ef143ec87a08eed44635baefe5de807cefbd4.tar.bz2 android_frameworks_opt_net_wifi-1b0ef143ec87a08eed44635baefe5de807cefbd4.zip | |
Merge "wifi:Provide UI with SIM info for EAP-SIM authentication"
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigStore.java')
| -rwxr-xr-x | service/java/com/android/server/wifi/WifiConfigStore.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index bf2f3a42e..c534e4307 100755 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -2654,6 +2654,15 @@ public class WifiConfigStore extends IpConfigStore { } } + if (!mWifiNative.setNetworkVariable( + netId, + WifiConfiguration.SIMNumVarName, + Integer.toString(config.SIMNum))) { + loge(config.SIMNum + ": failed to set sim no: " + +config.SIMNum); + break setVariables; + } + String allowedKeyManagementString = makeString(config.allowedKeyManagement, WifiConfiguration.KeyMgmt.strings); if (config.allowedKeyManagement.cardinality() != 0 && @@ -3484,6 +3493,15 @@ public class WifiConfigStore extends IpConfigStore { } } + value = mWifiNative.getNetworkVariable(netId, WifiConfiguration.SIMNumVarName); + if (!TextUtils.isEmpty(value)) { + try { + config.SIMNum = Integer.parseInt(value); + } catch (NumberFormatException ignore) { + Log.e(TAG,"error in parsing Selected Sim number " + config.SIMNum); + } + } + value = mWifiNative.getNetworkVariable(netId, WifiConfiguration.hiddenSSIDVarName); config.hiddenSSID = false; if (!TextUtils.isEmpty(value)) { |