Merge "p2p: Close the channel when onStop is called." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8f8e9c98f4
@@ -375,13 +375,20 @@ public class WifiP2pSettings extends DashboardFragment
|
||||
super.onPause();
|
||||
if (mWifiP2pManager != null && mChannel != null) {
|
||||
mWifiP2pManager.stopPeerDiscovery(mChannel, null);
|
||||
}
|
||||
getActivity().unregisterReceiver(mReceiver);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
if (mWifiP2pManager != null && mChannel != null) {
|
||||
if (!mLastGroupFormed) {
|
||||
// Close the channel when p2p doesn't connected.
|
||||
mChannel.close();
|
||||
mChannel = null;
|
||||
}
|
||||
}
|
||||
getActivity().unregisterReceiver(mReceiver);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user