summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
authorPaul Stewart <pstew@google.com>2016-05-20 08:14:30 -0700
committerPaul Stewart <pstew@google.com>2016-05-20 08:22:53 -0700
commit45e6fec2cfdb148b48100e65d9e7e207b8cdcf64 (patch)
treecaec2a2cc156d60be485a377d3fe28a38d77bcc2 /libs/androidfw/AssetManager.cpp
parentc21f84dddbe8144bb3d392b3b91c6df5f48aed42 (diff)
Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant configuration, we read both configurations into a instance of WifiNetworkSettings. No EAP configurations should be restored as per b/25725016, however existing EAP configurations that already reside in wpa_supplicant.conf (presumably configured in SUW) should not be removed in the process. This CL adds a parameter to the "readNetworks" method to allow it to select whether or not EAP configurations should be read in. It is used to allow the "restoreWifiSupplicant" method to copy in EAP configurations from the existing wpa_supplicant.conf, but not out of the backup data. BUG: 28873992 Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions