Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2d7c93 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am a5b42c07: am 5759a8a9: Merge "BluetoothMidiDevice: Cleanup and error... 

am a5b42c07: am 5759a8a9: Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev

* commit 'a5b42c07':
  BluetoothMidiDevice: Cleanup and error handling improvements
parents 211a6d93 a5b42c07

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

+19 −15
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public final class BluetoothMidiDevice { 
                        mBluetoothGatt.discoverServices());

            } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnected from GATT server.");

                // FIXME synchronize?

                close();

            }

        }
@@ -121,8 +120,8 @@ public final class BluetoothMidiDevice { 
                    }

                }

            } else {

                Log.w(TAG, "onServicesDiscovered received: " + status);

                // FIXME - report error back to client?

                Log.e(TAG, "onServicesDiscovered received: " + status);

                close();

            }

        }
@@ -137,9 +136,12 @@ public final class BluetoothMidiDevice { 


            BluetoothGattDescriptor descriptor = characteristic.getDescriptor(

                    CLIENT_CHARACTERISTIC_CONFIG);

            // FIXME null check

            if (descriptor != null) {

                descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);

                mBluetoothGatt.writeDescriptor(descriptor);

            } else {

                Log.e(TAG, "No CLIENT_CHARACTERISTIC_CONFIG for device " + mBluetoothDevice);

            }

        }



        @Override
@@ -244,7 +246,8 @@ public final class BluetoothMidiDevice { 
        }.start();

    }



    void close() {

    private void close() {

        synchronized (mBluetoothDevice) {

        mEventScheduler.close();

            if (mDeviceServer != null) {

                IoUtils.closeQuietly(mDeviceServer);
@@ -256,6 +259,7 @@ public final class BluetoothMidiDevice { 
                mBluetoothGatt = null;

            }

        }

    }



    public IBinder getBinder() {

        return mDeviceServer.asBinder();