From 4afd179a9ad7da51374c6fb0887180976d952001 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Wed, 20 Aug 2014 17:40:18 -0700 Subject: [PATCH] follow up minor fixes for connectivity manager test Change-Id: I8f0606890b21d67130efb3bc02c6825823060139 --- .../android/connectivitymanagertest/ConnectivityManagerTestBase.java | 2 +- .../connectivitymanagertest/functional/WifiAssociationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java index a35a8ee6be02..0f9d8e933f53 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestBase.java @@ -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(); } diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java index afaf801201d0..eb75b0d2be62 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/WifiAssociationTest.java @@ -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 + '"'; -- 2.11.0