diff options
author | Hu Wang <huw@codeaurora.org> | 2016-06-24 11:05:06 +0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-15 01:57:55 -0700 |
commit | 875d89598886a7a512ac3260b2076da73c908e50 (patch) | |
tree | 517f376c09acd3113709dde72321fc0c1b7cd634 | |
parent | 705773dcb7d480586af0f88541c114d26aee3171 (diff) | |
download | frameworks_opt_net_wifi-875d89598886a7a512ac3260b2076da73c908e50.tar.gz frameworks_opt_net_wifi-875d89598886a7a512ac3260b2076da73c908e50.tar.bz2 frameworks_opt_net_wifi-875d89598886a7a512ac3260b2076da73c908e50.zip |
wifi: Create new WifiConfiguration for savedConfig in addOrUpdateNetworkNative
With commit 5871e49caae132f154064807a864c7601c754da7, configurations
shall be set only if modified (in addOrUpdateNetworkNative).
To check if modified, savedConfig referenced the framework cache config
(from mConfiguredNetworks), then overwrite it with existing config from
supplicant.
If the config (to be updated) referenced the same framework cache config,
configurations has been overwritten hence will not be set.
In this specific instance, framework tries to DISABLE_TLS_1_2, but this
configuration shall never be set as the corresponding configuration is
always overwritten by the one in wpa_supplicant (which does not have
this configuration set).
This change is to create new WifiConfigration for savedConfig.
Change-Id: Id2ef886d4cbba840140a39f3cb4f00f992cf9f47
CRs-Fixed: 1033747
-rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index 767607b..e44896d 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -2826,8 +2826,9 @@ public class WifiConfigStore extends IpConfigStore { setVariables: { if (newNetwork == false ) { - savedConfig = mConfiguredNetworks.get(netId); - if (savedConfig != null) { + WifiConfiguration existingConfig = mConfiguredNetworks.get(netId); + if (existingConfig != null) { + savedConfig = new WifiConfiguration(existingConfig); readNetworkVariables(savedConfig); } } |