Merge "Bluetooth MIDI: Set MTU after service discovery" (9d626793) · Commits · e / os / android_frameworks_base

media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java

+18 −10

Original line number	Diff line number	Diff line
		@@ -100,16 +100,12 @@ public final class BluetoothMidiDevice {
		@Override
		public void onConnectionStateChange(BluetoothGatt gatt, int status,
		int newState) {
		Log.d(TAG, "onConnectionStateChange() status: " + status + ", newState: " + newState);
		String intentAction;
		if (newState == BluetoothProfile.STATE_CONNECTED) {
		Log.d(TAG, "Connected to GATT server.");
		Log.d(TAG, "Attempting to start service discovery:" +
		mBluetoothGatt.discoverServices());
		if (!mBluetoothGatt.requestMtu(MAX_PACKET_SIZE)) {
		Log.e(TAG, "request mtu failed");
		mPacketEncoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);
		mPacketDecoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);
		}
		} else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
		Log.i(TAG, "Disconnected from GATT server.");
		close();
		@@ -118,6 +114,7 @@ public final class BluetoothMidiDevice {

		@Override
		public void onServicesDiscovered(BluetoothGatt gatt, int status) {
		Log.d(TAG, "onServicesDiscovered() status: " + status);
		if (status == BluetoothGatt.GATT_SUCCESS) {
		BluetoothGattService service = gatt.getService(MIDI_SERVICE);
		if (service != null) {
		@@ -137,6 +134,13 @@ public final class BluetoothMidiDevice {
		// Specification says to read the characteristic first and then
		// switch to receiving notifications
		mBluetoothGatt.readCharacteristic(characteristic);

		// Request higher MTU size
		if (!gatt.requestMtu(MAX_PACKET_SIZE)) {
		Log.e(TAG, "request mtu failed");
		mPacketEncoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);
		mPacketDecoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);
		}
		}
		}
		} else {
		@@ -233,13 +237,13 @@ public final class BluetoothMidiDevice {
		System.arraycopy(buffer, 0, mCachedBuffer, 0, count);

		if (DEBUG) {
		logByteArray("Sent ", mCharacteristic.getValue(), 0,
		mCharacteristic.getValue().length);
		logByteArray("Sent ", mCachedBuffer, 0, mCachedBuffer.length);
		}

		if (mBluetoothGatt.writeCharacteristic(mCharacteristic, mCachedBuffer,
		mCharacteristic.getWriteType()) != BluetoothGatt.GATT_SUCCESS) {
		Log.w(TAG, "could not write characteristic to Bluetooth GATT");
		int result = mBluetoothGatt.writeCharacteristic(mCharacteristic, mCachedBuffer,
		mCharacteristic.getWriteType());
		if (result != BluetoothGatt.GATT_SUCCESS) {
		Log.w(TAG, "could not write characteristic to Bluetooth GATT. result: " + result);
		return false;
		}

		@@ -252,6 +256,10 @@ public final class BluetoothMidiDevice {
		mBluetoothDevice = device;
		mService = service;

		// Set a small default packet size in case there is an issue with configuring MTUs.
		mPacketEncoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);
		mPacketDecoder.setMaxPacketSize(DEFAULT_PACKET_SIZE);

		mBluetoothGatt = mBluetoothDevice.connectGatt(context, false, mGattCallback);

		mContext = context;