summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-08-08 01:55:44 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-09-08 16:41:47 +0900
commitffa390b6f37f20ab5f4ebf5c861c565db200107e (patch)
tree6e768b589a49674af8a9d4c6bb53778dd6f00f09 /core/java/android/net
parente58961aa5f86553f0106edbc03d1534b097fa25c (diff)
downloadframeworks_base-ffa390b6f37f20ab5f4ebf5c861c565db200107e.zip
frameworks_base-ffa390b6f37f20ab5f4ebf5c861c565db200107e.tar.gz
frameworks_base-ffa390b6f37f20ab5f4ebf5c861c565db200107e.tar.bz2
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
This makes testNetworkFactoryRequests 2-3 times faster. Bug: 22606153 Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69
Diffstat (limited to 'core/java/android/net')
-rw-r--r--core/java/android/net/NetworkFactory.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkFactory.java b/core/java/android/net/NetworkFactory.java
index 5f46c73..cab88b9 100644
--- a/core/java/android/net/NetworkFactory.java
+++ b/core/java/android/net/NetworkFactory.java
@@ -169,7 +169,8 @@ public class NetworkFactory extends Handler {
}
}
- private void handleAddRequest(NetworkRequest request, int score) {
+ @VisibleForTesting
+ protected void handleAddRequest(NetworkRequest request, int score) {
NetworkRequestInfo n = mNetworkRequests.get(request.requestId);
if (n == null) {
if (DBG) log("got request " + request + " with score " + score);
@@ -184,7 +185,8 @@ public class NetworkFactory extends Handler {
evalRequest(n);
}
- private void handleRemoveRequest(NetworkRequest request) {
+ @VisibleForTesting
+ protected void handleRemoveRequest(NetworkRequest request) {
NetworkRequestInfo n = mNetworkRequests.get(request.requestId);
if (n != null) {
mNetworkRequests.remove(request.requestId);