From 20f11b34f738d5586e0ad6b1cd50bbe4239de58d Mon Sep 17 00:00:00 2001 From: Calvin On Date: Wed, 15 Jun 2016 17:58:23 -0700 Subject: Fix race with BT disable in BLE_ON_STATE This will restart the BT stack when it detects a transition into OFF state while the user enable flag (mEnable) is set. Bug: 29363429 Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52 --- framework/java/android/bluetooth/BluetoothAdapter.java | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java') diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 9390bcd13d..47ae68796f 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -897,28 +897,10 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean enable() { - int state = BluetoothAdapter.STATE_OFF; if (isEnabled() == true) { if (DBG) Log.d(TAG, "enable(): BT is already enabled..!"); return true; } - // Use service interface to get the exact state - try { - mServiceLock.readLock().lock(); - if (mService != null) { - state = mService.getState(); - } - } catch (RemoteException e) { - Log.e(TAG, "", e); - } finally { - mServiceLock.readLock().unlock(); - } - - if (state == BluetoothAdapter.STATE_BLE_ON) { - Log.e(TAG, "BT is in BLE_ON State"); - notifyUserAction(true); - return true; - } try { return mManagerService.enable(); } catch (RemoteException e) {Log.e(TAG, "", e);} -- cgit v1.2.3