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

Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde

Browse Source 
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
This commit is contained in:
Chris Tate
2015-11-20 18:10:21 +00:00
committed by android-build-merger
parent 4943634c10 b5a38f6da5
commit 96333c2e8c
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
String key_mgmt = "";
boolean certUsed = false;
boolean hasWepKey = false;
boolean isEap = false;
final ArrayList<String> rawLines = new ArrayList<String>();
public static Network readFromStream(BufferedReader in) {
@@ -189,6 +190,9 @@ public class SettingsBackupAgent extends BackupAgentHelper {
ssid = line;
} else if (line.startsWith("key_mgmt=")) {
key_mgmt = line;
if (line.contains("EAP")) {
isEap = true;
}
} else if (line.startsWith("client_cert=")) {
certUsed = true;
} else if (line.startsWith("ca_cert=")) {
@@ -197,6 +201,8 @@ public class SettingsBackupAgent extends BackupAgentHelper {
certUsed = true;
} else if (line.startsWith("wep_")) {
hasWepKey = true;
} else if (line.startsWith("eap=")) {
isEap = true;
}
}
@@ -325,6 +331,13 @@ public class SettingsBackupAgent extends BackupAgentHelper {
continue;
}
}
// Don't propagate EAP network definitions
if (net.isEap) {
if (DEBUG_BACKUP) {
Log.v(TAG, "Skipping EAP network " + net.ssid + " / " + net.key_mgmt);
}
continue;
}
if (! mKnownNetworks.contains(net)) {
if (DEBUG_BACKUP) {
Log.v(TAG, "Adding " + net.ssid + " / " + net.key_mgmt);
@@ -353,6 +366,12 @@ public class SettingsBackupAgent extends BackupAgentHelper {
continue;
}
if (net.isEap) {
// Similarly, omit EAP network definitions to avoid propagating
// controlled enterprise network definitions.
continue;
}
net.write(w);
}
}