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

Merge "follow up minor fixes for connectivity manager test" into lmp-dev

Browse Source
This commit is contained in:
Guang Zhu
2014-08-21 00:47:30 +00:00
committed by Android (Google) Code Review
parent 75f9918760 4afd179a9a
commit e02f340d9a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java
View File

@@ -520,7 +520,7 @@ public class ConnectivityManagerTestBase extends InstrumentationTestCase {
* @param length required length of the string
* @return
*/
protected boolean isHex(String input, int length) {
protected static boolean isHex(String input, int length) {
Pattern p = Pattern.compile(String.format("[0-9A-Fa-f]{%d}", length));
return p.matcher(input).matches();
}

4
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java
View File

@@ -136,7 +136,7 @@ public class WifiAssociationTest extends ConnectivityManagerTestBase {
config.allowedProtocols.set(Protocol.WPA);
config.allowedPairwiseCiphers.set(PairwiseCipher.TKIP);
config.allowedGroupCiphers.set(GroupCipher.TKIP);
if (mPassword.matches("[0-9A-Fa-f]{64}")) {
if (isHex(mPassword, 64)) {
config.preSharedKey = mPassword;
} else {
config.preSharedKey = '"' + mPassword + '"';
@@ -150,7 +150,7 @@ public class WifiAssociationTest extends ConnectivityManagerTestBase {
config.allowedPairwiseCiphers.set(PairwiseCipher.CCMP);
config.allowedGroupCiphers.set(GroupCipher.CCMP);
config.allowedProtocols.set(Protocol.RSN);
if (mPassword.matches("[0-9A-Fa-f]{64}")) {
if (isHex(mPassword, 64)) {
config.preSharedKey = mPassword;
} else {
config.preSharedKey = '"' + mPassword + '"';