Merge "Handle response to AT+NREC command" into m-wireless-dev (5af2ff57) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ final class HeadsetClientStateMachine extends StateMachine {
		static final int SEND_DTMF = 17;
		static final int EXPLICIT_CALL_TRANSFER = 18;
		static final int LAST_VTAG_NUMBER = 19;
		static final int DISABLE_NREC = 20;

		// internal actions
		static final int QUERY_CURRENT_CALLS = 50;
		@@ -1496,9 +1497,15 @@ final class HeadsetClientStateMachine extends StateMachine {
		broadcastConnectionState(mCurrentDevice, BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_CONNECTING);
		// Send AT+NREC to remote if supported by audio
		if (HeadsetClientHalConstants.HANDSFREECLIENT_NREC_SUPPORTED) {
		sendATCmdNative(HeadsetClientHalConstants.HANDSFREECLIENT_AT_CMD_NREC,
		1 , 0, null);
		if (HeadsetClientHalConstants.HANDSFREECLIENT_NREC_SUPPORTED &&
		((mPeerFeatures & HeadsetClientHalConstants.PEER_FEAT_ECNR) ==
		HeadsetClientHalConstants.PEER_FEAT_ECNR)) {
		if (sendATCmdNative(HeadsetClientHalConstants.HANDSFREECLIENT_AT_CMD_NREC,
		1 , 0, null)) {
		addQueuedAction(DISABLE_NREC);
		} else {
		Log.e(TAG, "Failed to send NREC");
		}
		}
		transitionTo(mConnected);

		@@ -1941,6 +1948,11 @@ final class HeadsetClientStateMachine extends StateMachine {
		sendActionResultIntent(event);
		}
		break;
		case DISABLE_NREC:
		if (event.valueInt != HeadsetClientHalConstants.CMD_COMPLETE_OK) {
		Log.w(TAG, "Failed to disable AG's EC and NR");
		}
		break;
		case SET_MIC_VOLUME:
		case SET_SPEAKER_VOLUME:
		case SUBSCRIBER_INFO: