PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"

Browse Source 
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c6928581d4f91b008c109a6a4630bfaae':
  P2PSetting:Avoid p2p_find on group removal event
This commit is contained in:
Irfan Sheriff
2013-02-06 11:16:24 -08:00
committed by Android Git Automerger
parent 6639dee497 414d9e9c69
commit 5c879e48ed
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -28,6 +28,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pConfig;
import android.net.wifi.p2p.WifiP2pInfo;
import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList; import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pGroup;
@@ -88,6 +89,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
private boolean mWifiP2pSearching; private boolean mWifiP2pSearching;
private int mConnectedDevices; private int mConnectedDevices;
private WifiP2pGroup mConnectedGroup; private WifiP2pGroup mConnectedGroup;
private boolean mLastGroupFormed = false;
private PreferenceGroup mPeersGroup; private PreferenceGroup mPeersGroup;
private PreferenceGroup mPersistentGroup; private PreferenceGroup mPersistentGroup;
@@ -123,15 +125,19 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
if (mWifiP2pManager == null) return; if (mWifiP2pManager == null) return;
NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra( NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
WifiP2pManager.EXTRA_NETWORK_INFO); WifiP2pManager.EXTRA_NETWORK_INFO);
WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra(
WifiP2pManager.EXTRA_WIFI_P2P_INFO);
if (mWifiP2pManager != null) { if (mWifiP2pManager != null) {
mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this); mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this);
} }
if (networkInfo.isConnected()) { if (networkInfo.isConnected()) {
if (DBG) Log.d(TAG, "Connected"); if (DBG) Log.d(TAG, "Connected");
} else { } else if (mLastGroupFormed != true) {
//start a search when we are disconnected //start a search when we are disconnected
//but not on group removed broadcast event
startSearch(); startSearch();
} }
mLastGroupFormed = wifip2pinfo.groupFormed;
} else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) { } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {
mThisDevice = (WifiP2pDevice) intent.getParcelableExtra( mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
WifiP2pManager.EXTRA_WIFI_P2P_DEVICE); WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);