Merge "Handle state transition for p2p enable reject" (20258997) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,9 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
	public static final int GROUP_NEGOTIATION_TIMED_OUT = BASE + 3;		public static final int GROUP_NEGOTIATION_TIMED_OUT = BASE + 3;

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