Merge "Change AccessPointPreference key generation to match AccessPoint." into oc-mr1-dev
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
index 2c4f9c4..c24cdae 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
@@ -76,10 +76,10 @@
public static String generatePreferenceKey(AccessPoint accessPoint) {
StringBuilder builder = new StringBuilder();
- if (TextUtils.isEmpty(accessPoint.getBssid())) {
- builder.append(accessPoint.getSsidStr());
- } else {
+ if (TextUtils.isEmpty(accessPoint.getSsidStr())) {
builder.append(accessPoint.getBssid());
+ } else {
+ builder.append(accessPoint.getSsidStr());
}
builder.append(',').append(accessPoint.getSecurity());
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
index 7fe69a7..6cfdc28 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
@@ -36,26 +36,28 @@
private Context mContext = RuntimeEnvironment.application;
@Test
- public void generatePreferenceKey_shouldReturnSsidPlusSecurity() {
+ public void generatePreferenceKey_returnsSsidPlusSecurity() {
String ssid = "ssid";
+ String bssid = "00:00:00:00:00:00";
int security = AccessPoint.SECURITY_WEP;
String expectedKey = ssid + ',' + security;
TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext);
- builder.setSsid(ssid).setSecurity(security);
+ builder.setBssid(bssid).setSsid(ssid).setSecurity(security);
assertThat(AccessPointPreference.generatePreferenceKey(builder.build()))
.isEqualTo(expectedKey);
}
@Test
- public void generatePreferenceKey_shouldReturnBssidPlusSecurity() {
- String bssid = "bssid";
+ public void generatePreferenceKey_emptySsidReturnsBssidPlusSecurity() {
+ String ssid = "";
+ String bssid = "00:00:00:00:00:00";
int security = AccessPoint.SECURITY_WEP;
String expectedKey = bssid + ',' + security;
TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext);
- builder.setBssid(bssid).setSecurity(security);
+ builder.setBssid(bssid).setSsid(ssid).setSecurity(security);
assertThat(AccessPointPreference.generatePreferenceKey(builder.build()))
.isEqualTo(expectedKey);