diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-30 10:56:47 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-08-30 15:54:37 -0700 |
| commit | 37e65ebb7eb932e1a144b1cab262e11ca5fd109b (patch) | |
| tree | 8778822097d0ab67bc0a4c222cd7e01d2ade9082 /core/java/android/net/MobileDataStateTracker.java | |
| parent | e82235ae7049badf6758ffef3c13080b135986f4 (diff) | |
Rename NetworkProperties to LinkProperties
Also add copy constructors and use them when giving out data.
Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
Diffstat (limited to 'core/java/android/net/MobileDataStateTracker.java')
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 6dfd3bc8aad1..0498fff41733 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -16,8 +16,6 @@ package android.net; -import java.net.InetAddress; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -32,7 +30,7 @@ import com.android.internal.telephony.Phone; import com.android.internal.telephony.TelephonyIntents; import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo; -import android.net.NetworkProperties; +import android.net.LinkProperties; import android.telephony.TelephonyManager; import android.util.Log; import android.text.TextUtils; @@ -58,7 +56,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { private boolean mTeardownRequested = false; private Handler mTarget; private Context mContext; - private NetworkProperties mNetworkProperties; + private LinkProperties mLinkProperties; private boolean mPrivateDnsRouteSet = false; private int mDefaultGatewayAddr = 0; private boolean mDefaultRouteSet = false; @@ -213,8 +211,8 @@ public class MobileDataStateTracker implements NetworkStateTracker { + e); } } - if (doReset && mNetworkProperties != null) { - String iface = mNetworkProperties.getInterfaceName(); + if (doReset && mLinkProperties != null) { + String iface = mLinkProperties.getInterfaceName(); if (iface != null) NetworkUtils.resetConnections(iface); } // TODO - check this @@ -233,11 +231,11 @@ public class MobileDataStateTracker implements NetworkStateTracker { setDetailedState(DetailedState.SUSPENDED, reason, apnName); break; case CONNECTED: - mNetworkProperties = intent.getParcelableExtra( - Phone.DATA_NETWORK_PROPERTIES_KEY); - if (mNetworkProperties == null) { + mLinkProperties = intent.getParcelableExtra( + Phone.DATA_LINK_PROPERTIES_KEY); + if (mLinkProperties == null) { Log.d(TAG, - "CONNECTED event did not supply network properties."); + "CONNECTED event did not supply link properties."); } setDetailedState(DetailedState.CONNECTED, reason, apnName); break; @@ -563,7 +561,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { } } - public NetworkProperties getNetworkProperties() { - return mNetworkProperties; + public LinkProperties getLinkProperties() { + return new LinkProperties(mLinkProperties); } } |