commit | 29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481 | [log] [tgz] |
---|---|---|
author | Pavlin Radoslavov <pavlin@google.com> | Mon Aug 03 17:44:47 2015 -0700 |
committer | Andre Eisenbach <eisenbach@google.com> | Tue Aug 04 04:31:12 2015 +0000 |
tree | dd4bfae06e2b790ae4055397d831957944737d32 | |
parent | 59d72c86269f4d0c914c233d16a9bf00f0440df8 [diff] |
Reset the pointer to the Bluetooth GATT service During error recovery, if the mBluetooth pointer is reset to null, reset the mBluetoothGatt pointer as well. Bug: 21756298 Change-Id: I26204ba47dd3c5465bb7de30cfa5dc0f07eee2fd
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 10a4cd1..50bd544 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -1506,6 +1506,7 @@ //Unbind mContext.unbindService(mConnection); } + mBluetoothGatt = null; } SystemClock.sleep(100); @@ -1811,6 +1812,7 @@ //Unbind mContext.unbindService(mConnection); } + mBluetoothGatt = null; } mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);