Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle state transition for p2p enable reject"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-09-07 10:53:34 -07:00
committed by Android (Google) Code Review
parent 727e6ba5df dff28d5293
commit 20258997fb
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@@ -128,7 +128,9 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
public static final int GROUP_NEGOTIATION_TIMED_OUT = BASE + 3;
/* User accepted to disable Wi-Fi in order to enable p2p */
private static final int WIFI_DISABLE_USER_ACCEPT = BASE + 11;
private static final int WIFI_DISABLE_USER_ACCEPT = BASE + 4;
/* User rejected to disable Wi-Fi in order to enable p2p */
private static final int WIFI_DISABLE_USER_REJECT = BASE + 5;
private final boolean mP2pSupported;
private final String mDeviceType;
@@ -359,6 +361,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
break;
// Ignore
case WIFI_DISABLE_USER_ACCEPT:
case WIFI_DISABLE_USER_REJECT:
case GROUP_NEGOTIATION_TIMED_OUT:
break;
default:
@@ -457,8 +460,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (which == DialogInterface.BUTTON_POSITIVE) {
sendMessage(WIFI_DISABLE_USER_ACCEPT);
} else {
logd("User rejected enabling p2p");
//ignore
sendMessage(WIFI_DISABLE_USER_REJECT);
}
}
};
@@ -509,6 +511,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
mWifiChannel.sendMessage(P2P_ENABLE_PENDING);
transitionTo(mWaitForWifiDisableState);
break;
case WIFI_DISABLE_USER_REJECT:
logd("User rejected enabling p2p");
sendP2pStateChangedBroadcast(false);
transitionTo(mP2pDisabledState);
break;
case WifiP2pManager.ENABLE_P2P:
case WifiP2pManager.DISABLE_P2P:
deferMessage(message);