From 70918513a2594d2c315e3addbc287eb9e378e49f Mon Sep 17 00:00:00 2001 From: Nalla Kartheek Date: Wed, 24 Jun 2015 18:09:06 +0530 Subject: Wifi: Maintain configKey generation logic same in backup agent AutoJoinController uses configKey to distinguish networks. It compares configKeys of saved network with recent ScanResult. WifiConfiguration has two different APIs to generate configKey based on input variables. Framework should use same logic to generate configkey even though input differs. This fix ensures the parity in backup agent. Change-Id: I6ee57efe1d346e50a434bce90ec8224f5203712c --- .../src/com/android/providers/settings/SettingsBackupAgent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/SettingsProvider/src/com/android/providers/settings') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index b9a9c24..7a8caf5 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -255,13 +255,13 @@ public class SettingsBackupAgent extends BackupAgentHelper { // Now build the canonical config key paralleling the WifiConfiguration semantics final String key; if (types.get(KeyMgmt.WPA_PSK)) { - key = bareSsid + KeyMgmt.strings[KeyMgmt.WPA_PSK]; + key = bareSsid + "-" + KeyMgmt.strings[KeyMgmt.WPA_PSK]; } else if (types.get(KeyMgmt.WPA_EAP) || types.get(KeyMgmt.IEEE8021X)) { - key = bareSsid + KeyMgmt.strings[KeyMgmt.WPA_EAP]; + key = bareSsid + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP]; } else if (hasWepKey) { - key = bareSsid + "WEP"; // hardcoded this way in WifiConfiguration + key = bareSsid + "-WEP"; // hardcoded this way in WifiConfiguration } else { - key = bareSsid + KeyMgmt.strings[KeyMgmt.NONE]; + key = bareSsid + "-" + KeyMgmt.strings[KeyMgmt.NONE]; } return key; } -- cgit v1.1