commit 5759a8a9cfef08b7f9485c67b07be9ae268dea0a
author Mike Lockwood <lockwood@google.com> Fri May 08 22:19:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 22:19:56 2015 +0000
tree da009a9d2a8be8741da59b16f01af6a8f4f26cdc
parent ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89
parent 9490eae3aa6b20cbd3c1557fd3a7eb927e12907f

Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev

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

diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
index 63a8da7..0ccbf6a 100644
--- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
+++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothMidiDevice.java
@@ -92,7 +92,6 @@
                         mBluetoothGatt.discoverServices());
             } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
                 Log.i(TAG, "Disconnected from GATT server.");
-                // FIXME synchronize?
                 close();
             }
         }
@@ -121,8 +120,8 @@
                     }
                 }
             } else {
-                Log.w(TAG, "onServicesDiscovered received: " + status);
-                // FIXME - report error back to client?
+                Log.e(TAG, "onServicesDiscovered received: " + status);
+                close();
             }
         }
 
@@ -137,9 +136,12 @@
 
             BluetoothGattDescriptor descriptor = characteristic.getDescriptor(
                     CLIENT_CHARACTERISTIC_CONFIG);
-            // FIXME null check
-            descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
-            mBluetoothGatt.writeDescriptor(descriptor);
+            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,16 +246,18 @@
         }.start();
     }
 
-    void close() {
+    private void close() {
+        synchronized (mBluetoothDevice) {
         mEventScheduler.close();
-        if (mDeviceServer != null) {
-            IoUtils.closeQuietly(mDeviceServer);
-            mDeviceServer = null;
-            mService.deviceClosed(mBluetoothDevice);
-        }
-        if (mBluetoothGatt != null) {
-            mBluetoothGatt.close();
-            mBluetoothGatt = null;
+            if (mDeviceServer != null) {
+                IoUtils.closeQuietly(mDeviceServer);
+                mDeviceServer = null;
+                mService.deviceClosed(mBluetoothDevice);
+            }
+            if (mBluetoothGatt != null) {
+                mBluetoothGatt.close();
+                mBluetoothGatt = null;
+            }
         }
     }