Reset the pointer to the Bluetooth GATT service

Pavlin Radoslavov · Andre Eisenbach · commit 29b8c4ab8ac4 · 2015-08-04T04:31:12.000Z
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
@@ -1506,6 +1506,7 @@ public void handleMessage(Message msg) {
                                 //Unbind
                                 mContext.unbindService(mConnection);
                             }
+                            mBluetoothGatt = null;
                         }
                         SystemClock.sleep(100);
 
@@ -1811,6 +1812,7 @@ private void recoverBluetoothServiceFromError() {
                 //Unbind
                 mContext.unbindService(mConnection);
             }
+            mBluetoothGatt = null;
         }
 
         mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

Original file line number	Diff line number	Diff line change
`@@ -1506,6 +1506,7 @@ public void handleMessage(Message msg) {`
`1506`	`1506`	`//Unbind`
`1507`	`1507`	`mContext.unbindService(mConnection);`
`1508`	`1508`	`}`
	`1509`	`+ mBluetoothGatt = null;`
`1509`	`1510`	`}`
`1510`	`1511`	`SystemClock.sleep(100);`
`1511`	`1512`
`@@ -1811,6 +1812,7 @@ private void recoverBluetoothServiceFromError() {`
`1811`	`1812`	`//Unbind`
`1812`	`1813`	`mContext.unbindService(mConnection);`
`1813`	`1814`	`}`
	`1815`	`+ mBluetoothGatt = null;`
`1814`	`1816`	`}`
`1815`	`1817`
`1816`	`1818`	`mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);`