diff options
author | Robert Greenwalt <robdroid@android.com> | 2010-08-25 17:48:47 -0700 |
---|---|---|
committer | Robert Greenwalt <robdroid@android.com> | 2010-08-25 17:48:47 -0700 |
commit | b21b62327c10e92baf1a88e77f1c6d5576a17d62 (patch) | |
tree | 7420ddfb92ad8264edda6c240ace5b9a999661ee /core/java/android/net/MobileDataStateTracker.java | |
parent | 96dc45597e53742a2c8453f9ce03f7d501a75668 (diff) | |
parent | b998f3111df82149567935138945500f33451b1a (diff) | |
download | frameworks_base-b21b62327c10e92baf1a88e77f1c6d5576a17d62.zip frameworks_base-b21b62327c10e92baf1a88e77f1c6d5576a17d62.tar.gz frameworks_base-b21b62327c10e92baf1a88e77f1c6d5576a17d62.tar.bz2 |
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
Diffstat (limited to 'core/java/android/net/MobileDataStateTracker.java')
-rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index eb7117b..004cdb7 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -16,6 +16,8 @@ package android.net; +import java.net.InetAddress; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,7 +25,6 @@ import android.content.IntentFilter; import android.os.RemoteException; import android.os.Handler; import android.os.ServiceManager; -import android.os.SystemProperties; import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.Phone; import com.android.internal.telephony.TelephonyIntents; @@ -489,17 +490,16 @@ public class MobileDataStateTracker extends NetworkStateTracker { * Ensure that a network route exists to deliver traffic to the specified * host via the mobile data network. * @param hostAddress the IP address of the host to which the route is desired, - * in network byte order. * @return {@code true} on success, {@code false} on failure */ @Override - public boolean requestRouteToHost(int hostAddress) { + public boolean requestRouteToHost(InetAddress hostAddress) { if (DBG) { - Log.d(TAG, "Requested host route to " + Integer.toHexString(hostAddress) + + Log.d(TAG, "Requested host route to " + hostAddress.getHostAddress() + " for " + mApnType + "(" + mInterfaceName + ")"); } - if (mInterfaceName != null && hostAddress != -1) { - return NetworkUtils.addHostRoute(mInterfaceName, hostAddress) == 0; + if (mInterfaceName != null) { + return NetworkUtils.addHostRoute(mInterfaceName, hostAddress, null); } else { return false; } |