Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev

Browse Source 
* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup
This commit is contained in:
Vinit Deshapnde
2013-09-12 10:56:15 -07:00
committed by Android Git Automerger
parent 7d62664d88 074dc2eb2d
commit 2f2184b755
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
static class Network { static class Network {
String ssid = ""; // equals() and hashCode() need these to be non-null String ssid = ""; // equals() and hashCode() need these to be non-null
String key_mgmt = ""; String key_mgmt = "";
boolean certUsed = false;
final ArrayList<String> rawLines = new ArrayList<String>(); final ArrayList<String> rawLines = new ArrayList<String>();
public static Network readFromStream(BufferedReader in) { public static Network readFromStream(BufferedReader in) {
@@ -167,6 +168,12 @@ public class SettingsBackupAgent extends BackupAgentHelper {
ssid = line; ssid = line;
} else if (line.startsWith("key_mgmt")) { } else if (line.startsWith("key_mgmt")) {
key_mgmt = line; key_mgmt = line;
} else if (line.startsWith("client_cert=")) {
certUsed = true;
} else if (line.startsWith("ca_cert=")) {
certUsed = true;
} else if (line.startsWith("ca_path=")) {
certUsed = true;
} }
} }
@@ -246,6 +253,13 @@ public class SettingsBackupAgent extends BackupAgentHelper {
public void write(Writer w) throws IOException { public void write(Writer w) throws IOException {
for (Network net : mNetworks) { for (Network net : mNetworks) {
if (net.certUsed) {
// Networks that use certificates for authentication can't be restored
// because the certificates they need don't get restored (because they
// are stored in keystore, and can't be restored)
continue;
}
net.write(w); net.write(w);
} }
} }