summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-12-12 12:22:31 -0800
committerRobert Greenwalt <rgreenwalt@google.com>2015-01-14 16:55:38 -0800
commit2ffe412b0eb8f53043356fe50dc4ceb04d267fa2 (patch)
tree1356096c033b3539dd1aeb692896c7cd7696987c /core/java/android
parent1a6dd2985ef1eab036f6fc77cf723e3f12832e93 (diff)
Rerun entitlementcheck on sim change.
Only run if entitlement is needed and tethering is running. bug:18356505 Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/NetworkFactory.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkFactory.java b/core/java/android/net/NetworkFactory.java
index 9b80e7485b5b..64d0fcf76c06 100644
--- a/core/java/android/net/NetworkFactory.java
+++ b/core/java/android/net/NetworkFactory.java
@@ -219,16 +219,21 @@ public class NetworkFactory extends Handler {
}
private void evalRequest(NetworkRequestInfo n) {
+ if (VDBG) log("evalRequest");
if (n.requested == false && n.score < mScore &&
n.request.networkCapabilities.satisfiedByNetworkCapabilities(
mCapabilityFilter) && acceptRequest(n.request, n.score)) {
+ if (VDBG) log(" needNetworkFor");
needNetworkFor(n.request, n.score);
n.requested = true;
} else if (n.requested == true &&
(n.score > mScore || n.request.networkCapabilities.satisfiedByNetworkCapabilities(
mCapabilityFilter) == false || acceptRequest(n.request, n.score) == false)) {
+ if (VDBG) log(" releaseNetworkFor");
releaseNetworkFor(n.request);
n.requested = false;
+ } else {
+ if (VDBG) log(" done");
}
}