summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-10-18 09:42:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-18 09:42:33 -0700
commitdba69061a6e9c25d968819cee47ab13e5b554b9a (patch)
treeeb26709d45d6a2927480bb46d72071589fc24ea1 /core/java
parenta548b5cb82008d2d6629ab78ba775a24bff55040 (diff)
parent12e24ae7600f8297abcde0d7c29d6cfb64f59dfb (diff)
downloadframeworks_base-dba69061a6e9c25d968819cee47ab13e5b554b9a.zip
frameworks_base-dba69061a6e9c25d968819cee47ab13e5b554b9a.tar.gz
frameworks_base-dba69061a6e9c25d968819cee47ab13e5b554b9a.tar.bz2
Merge "Send availability info more reliably" into ics-mr0
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/MobileDataStateTracker.java5
-rw-r--r--core/java/android/net/NetworkStateTracker.java3
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index 62bb965..54a89ad 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -197,7 +197,10 @@ public class MobileDataStateTracker implements NetworkStateTracker {
String apnName = intent.getStringExtra(Phone.DATA_APN_KEY);
mNetworkInfo.setRoaming(intent.getBooleanExtra(Phone.DATA_NETWORK_ROAMING_KEY,
false));
-
+ if (VDBG) {
+ log(mApnType + " setting isAvailable to " +
+ intent.getBooleanExtra(Phone.NETWORK_UNAVAILABLE_KEY,false));
+ }
mNetworkInfo.setIsAvailable(!intent.getBooleanExtra(Phone.NETWORK_UNAVAILABLE_KEY,
false));
diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java
index 1735592..7df0193 100644
--- a/core/java/android/net/NetworkStateTracker.java
+++ b/core/java/android/net/NetworkStateTracker.java
@@ -132,6 +132,9 @@ public interface NetworkStateTracker {
* Returns an indication of whether this network is available for
* connections. A value of {@code false} means that some quasi-permanent
* condition prevents connectivity to this network.
+ *
+ * NOTE that this is broken on multi-connection devices. Should be fixed in J release
+ * TODO - fix on multi-pdp devices
*/
public boolean isAvailable();