diff options
| author | Dave Burke <daveburke@google.com> | 2012-09-25 23:30:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 23:30:48 -0700 |
| commit | ca68f4a32f7712876cad59ceff768c37c334214c (patch) | |
| tree | c8f30121cd70197601c1eb2b6b1a090dcc52a4e6 | |
| parent | 17ef62cc1f9d092669af0fed465a9a77e0dc1a4f (diff) | |
| parent | 0f08b813bb0f14f00cf167eeb49b5eea8f3b4f0f (diff) | |
| download | frameworks_base-ca68f4a32f7712876cad59ceff768c37c334214c.zip frameworks_base-ca68f4a32f7712876cad59ceff768c37c334214c.tar.gz frameworks_base-ca68f4a32f7712876cad59ceff768c37c334214c.tar.bz2 | |
Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index a5a2469..55ea34f 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -25,7 +25,6 @@ import android.net.LinkProperties; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; import android.net.NetworkStateTracker; -import android.net.wifi.p2p.WifiP2pManager; import android.os.Handler; import android.os.Message; import android.util.Slog; @@ -88,7 +87,6 @@ public class WifiStateTracker implements NetworkStateTracker { IntentFilter filter = new IntentFilter(); filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); filter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION); - filter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION); mWifiStateReceiver = new WifiStateReceiver(); mContext.registerReceiver(mWifiStateReceiver, filter); @@ -217,20 +215,7 @@ public class WifiStateTracker implements NetworkStateTracker { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION)) { - mNetworkInfo = (NetworkInfo) intent.getParcelableExtra( - WifiP2pManager.EXTRA_NETWORK_INFO); - mLinkProperties = intent.getParcelableExtra( - WifiP2pManager.EXTRA_LINK_PROPERTIES); - if (mLinkProperties == null) { - mLinkProperties = new LinkProperties(); - } - mLinkCapabilities = intent.getParcelableExtra( - WifiP2pManager.EXTRA_LINK_CAPABILITIES); - if (mLinkCapabilities == null) { - mLinkCapabilities = new LinkCapabilities(); - } - } else if (intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { + if (intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) { mNetworkInfo = (NetworkInfo) intent.getParcelableExtra( WifiManager.EXTRA_NETWORK_INFO); mLinkProperties = intent.getParcelableExtra( |