drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712

Browse Source 
am: 7ca542fa99

* commit '7ca542fa99362f15da8d3f57b4916d87c1f67eb3':
  Don't remove existing EAP configurations

Change-Id: I9808325df8d34bb2d08f99b384ff5ad07b6a2273
This commit is contained in:
Paul Stewart
2016-05-20 17:49:10 +00:00
committed by android-build-merger
parent bc9e59d1a7 7ca542fa99
commit 131b976fe4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
View File

@ -329,7 +329,8 @@ public class SettingsBackupAgent extends BackupAgentHelper {
final HashSet<Network> mKnownNetworks = new HashSet<Network>(); final HashSet<Network> mKnownNetworks = new HashSet<Network>();
final ArrayList<Network> mNetworks = new ArrayList<Network>(8); final ArrayList<Network> mNetworks = new ArrayList<Network>(8);
public void readNetworks(BufferedReader in, List<WifiConfiguration> whitelist) { public void readNetworks(BufferedReader in, List<WifiConfiguration> whitelist,
boolean acceptEapNetworks) {
try { try {
String line; String line;
while (in.ready()) { while (in.ready()) {
@ -348,7 +349,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
} }
} }
// Don't propagate EAP network definitions // Don't propagate EAP network definitions
if (net.isEap) { if (net.isEap && !acceptEapNetworks) {
if (DEBUG_BACKUP) { if (DEBUG_BACKUP) {
Log.v(TAG, "Skipping EAP network " + net.ssid + " / " + net.key_mgmt); Log.v(TAG, "Skipping EAP network " + net.ssid + " / " + net.key_mgmt);
} }
@ -1176,7 +1177,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
WifiNetworkSettings fromFile = new WifiNetworkSettings(); WifiNetworkSettings fromFile = new WifiNetworkSettings();
br = new BufferedReader(new FileReader(file)); br = new BufferedReader(new FileReader(file));
fromFile.readNetworks(br, configs); fromFile.readNetworks(br, configs, false);
// Write the parsed networks into a packed byte array // Write the parsed networks into a packed byte array
if (fromFile.mKnownNetworks.size() > 0) { if (fromFile.mKnownNetworks.size() > 0) {
@ -1204,7 +1205,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
if (supplicantFile.exists()) { if (supplicantFile.exists()) {
// Retain the existing APs; we'll append the restored ones to them // Retain the existing APs; we'll append the restored ones to them
BufferedReader in = new BufferedReader(new FileReader(FILE_WIFI_SUPPLICANT)); BufferedReader in = new BufferedReader(new FileReader(FILE_WIFI_SUPPLICANT));
supplicantImage.readNetworks(in, null); supplicantImage.readNetworks(in, null, true);
in.close(); in.close();
supplicantFile.delete(); supplicantFile.delete();
@ -1215,7 +1216,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
char[] restoredAsBytes = new char[size]; char[] restoredAsBytes = new char[size];
for (int i = 0; i < size; i++) restoredAsBytes[i] = (char) bytes[i]; for (int i = 0; i < size; i++) restoredAsBytes[i] = (char) bytes[i];
BufferedReader in = new BufferedReader(new CharArrayReader(restoredAsBytes)); BufferedReader in = new BufferedReader(new CharArrayReader(restoredAsBytes));
supplicantImage.readNetworks(in, null); supplicantImage.readNetworks(in, null, false);
if (DEBUG_BACKUP) { if (DEBUG_BACKUP) {
Log.v(TAG, "Final AP list:"); Log.v(TAG, "Final AP list:");
@ -1371,4 +1372,4 @@ public class SettingsBackupAgent extends BackupAgentHelper {
} }
return WifiManager.WIFI_STATE_UNKNOWN; return WifiManager.WIFI_STATE_UNKNOWN;
} }
} }