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

Merge "Use updated wifip2pmanager API"

Browse Source
This commit is contained in:
repo sync
2011-08-16 14:51:06 -07:00
committed by Android (Google) Code Review
parent 2f90d4e403 76feb7f1c1
commit 38853a202f
2 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
View File

@@ -43,6 +43,7 @@ public class WifiP2pEnabler implements CompoundButton.OnCheckedChangeListener {
private final IntentFilter mIntentFilter; private final IntentFilter mIntentFilter;
private final Handler mHandler = new WifiP2pHandler(); private final Handler mHandler = new WifiP2pHandler();
private WifiP2pManager mWifiP2pManager; private WifiP2pManager mWifiP2pManager;
private WifiP2pManager.Channel mChannel;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -61,12 +62,17 @@ public class WifiP2pEnabler implements CompoundButton.OnCheckedChangeListener {
mSwitch = switch_; mSwitch = switch_;
mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE); mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
if (!mWifiP2pManager.connectHandler(mContext, mHandler)) { if (mWifiP2pManager != null) {
mChannel = mWifiP2pManager.initialize(mContext, mHandler);
if (mChannel == null) {
//Failure to set up connection //Failure to set up connection
Log.e(TAG, "Failed to set up connection with wifi p2p service"); Log.e(TAG, "Failed to set up connection with wifi p2p service");
mWifiP2pManager = null; mWifiP2pManager = null;
mSwitch.setEnabled(false); mSwitch.setEnabled(false);
} }
} else {
Log.e(TAG, "mWifiP2pManager is null!");
}
mIntentFilter = new IntentFilter(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION); mIntentFilter = new IntentFilter(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
} }
@@ -97,9 +103,9 @@ public class WifiP2pEnabler implements CompoundButton.OnCheckedChangeListener {
if (mWifiP2pManager == null) return; if (mWifiP2pManager == null) return;
if (isChecked) { if (isChecked) {
mWifiP2pManager.enableP2p(); mWifiP2pManager.enableP2p(mChannel);
} else { } else {
mWifiP2pManager.disableP2p(); mWifiP2pManager.disableP2p(mChannel);
} }
} }

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

@@ -26,6 +26,7 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.net.NetworkInfo;
import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pConfig;
import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList; import android.net.wifi.p2p.WifiP2pDeviceList;
@@ -64,6 +65,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
private final IntentFilter mIntentFilter = new IntentFilter(); private final IntentFilter mIntentFilter = new IntentFilter();
private final Handler mHandler = new WifiP2pHandler(); private final Handler mHandler = new WifiP2pHandler();
private WifiP2pManager mWifiP2pManager; private WifiP2pManager mWifiP2pManager;
private WifiP2pManager.Channel mChannel;
private WifiP2pEnabler mWifiP2pEnabler; private WifiP2pEnabler mWifiP2pEnabler;
private WifiP2pDialog mConnectDialog; private WifiP2pDialog mConnectDialog;
private OnClickListener mConnectListener; private OnClickListener mConnectListener;
@@ -81,7 +83,18 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
if (WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION.equals(action)) { if (WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION.equals(action)) {
//TODO: nothing right now //TODO: nothing right now
} else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
if (mWifiP2pManager != null) mWifiP2pManager.requestPeers(); if (mWifiP2pManager != null) mWifiP2pManager.requestPeers(mChannel);
} else if (WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION.equals(action)) {
if (mWifiP2pManager == null) return;
NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
WifiP2pManager.EXTRA_NETWORK_INFO);
if (networkInfo.isConnected()) {
Log.d(TAG, "Start peer connections");
mWifiP2pManager.startPeerCommunication();
} else {
Log.d(TAG, "Stop peer connections");
mWifiP2pManager.stopPeerCommunication();
}
} }
} }
}; };
@@ -93,14 +106,20 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION); mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION); mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
final Activity activity = getActivity(); final Activity activity = getActivity();
mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
if (!mWifiP2pManager.connectHandler(activity, mHandler)) { if (mWifiP2pManager != null) {
mChannel = mWifiP2pManager.initialize(activity, mHandler);
if (mChannel == null) {
//Failure to set up connection //Failure to set up connection
Log.e(TAG, "Failed to set up connection with wifi p2p service"); Log.e(TAG, "Failed to set up connection with wifi p2p service");
mWifiP2pManager = null; mWifiP2pManager = null;
} }
} else {
Log.e(TAG, "mWifiP2pManager is null !");
}
Switch actionBarSwitch = new Switch(activity); Switch actionBarSwitch = new Switch(activity);
@@ -128,7 +147,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
if (which == DialogInterface.BUTTON_POSITIVE) { if (which == DialogInterface.BUTTON_POSITIVE) {
WifiP2pConfig config = mConnectDialog.getConfig(); WifiP2pConfig config = mConnectDialog.getConfig();
if (mWifiP2pManager != null) { if (mWifiP2pManager != null) {
mWifiP2pManager.connect(config); mWifiP2pManager.connect(mChannel, config);
} }
} }
} }
@@ -140,7 +159,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) { if (which == DialogInterface.BUTTON_POSITIVE) {
if (mWifiP2pManager != null) { if (mWifiP2pManager != null) {
mWifiP2pManager.disconnect(); mWifiP2pManager.disconnect(mChannel);
} }
} }
} }
@@ -155,7 +174,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
if (mWifiP2pEnabler != null) { if (mWifiP2pEnabler != null) {
mWifiP2pEnabler.resume(); mWifiP2pEnabler.resume();
} }
if (mWifiP2pManager != null) mWifiP2pManager.discoverPeers();
if (mWifiP2pManager != null) mWifiP2pManager.discoverPeers(mChannel);
} }
@Override @Override
@@ -182,10 +202,14 @@ public class WifiP2pSettings extends SettingsPreferenceFragment {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case MENU_ID_SEARCH: case MENU_ID_SEARCH:
mWifiP2pManager.discoverPeers(); if (mWifiP2pManager != null) {
mWifiP2pManager.discoverPeers(mChannel);
}
return true; return true;
case MENU_ID_CREATE_GROUP: case MENU_ID_CREATE_GROUP:
mWifiP2pManager.createGroup(); if (mWifiP2pManager != null) {
mWifiP2pManager.createGroup(mChannel);
}
return true; return true;
case MENU_ID_ADVANCED: case MENU_ID_ADVANCED:
//TODO: add advanced settings for p2p //TODO: add advanced settings for p2p