Remove WifiStateTracker&nbs…

https://android.googlesource.com/platform/frameworks/base/+/0f08b813bb0f14f00cf167eeb49b5eea8f3b4f0f

Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev

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.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 @@

         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 @@

         @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(