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

Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev am: 6a62328517

Browse Source 
am: 08af7417c7

Change-Id: I9adc1886593006cd53911ec63a2a0ccda730d3e9
This commit is contained in:
Sundeep Ghuman
2017-06-29 04:49:06 +00:00
committed by android-build-merger
parent d336afa909 08af7417c7
commit 5e571387bb
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -322,8 +322,15 @@ public class AccessPoint implements Comparable<AccessPoint> {
if (difference != 0) {
return difference;
}
// Sort by ssid.
return getSsidStr().compareToIgnoreCase(other.getSsidStr());
difference = getSsidStr().compareToIgnoreCase(other.getSsidStr());
if (difference != 0) {
return difference;
}
// Do a case sensitive comparison to distinguish SSIDs that differ in case only
return getSsidStr().compareTo(other.getSsidStr());
}
@Override

15
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
View File

@@ -168,6 +168,21 @@ public class AccessPointTest {
assertSortingWorks(firstAp, secondAp);
}
@Test
public void testCompareTo_GivesSsidCasePrecendenceAfterAlphabetical() {
final String firstName = "aaAaaa";
final String secondName = "aaaaaa";
final String thirdName = "BBBBBB";
AccessPoint firstAp = new TestAccessPointBuilder(mContext).setSsid(firstName).build();
AccessPoint secondAp = new TestAccessPointBuilder(mContext).setSsid(secondName).build();
AccessPoint thirdAp = new TestAccessPointBuilder(mContext).setSsid(thirdName).build();
assertSortingWorks(firstAp, secondAp);
assertSortingWorks(secondAp, thirdAp);
}
@Test
public void testCompareTo_AllSortingRulesCombined() {