diff options
| author | Zach Johnson <zachoverflow@google.com> | 2019-11-26 21:30:07 -0800 |
|---|---|---|
| committer | Zach Johnson <zachoverflow@google.com> | 2019-11-26 21:33:59 -0800 |
| commit | 76236d77f4e19202619e6f97e88c425b469a010f (patch) | |
| tree | 0c716655de0feb4305f5adc5fc23ed2d584f8f17 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 0f2c3d963d348f63ee53bb35ae0df4661fa978dd (diff) | |
Implement isEnabled in terms of getState
Bug: 145171640
Test: compile & check everything works normally
Change-Id: I169e220ab83546d76317e518652c66c9bd2229a2
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 9d152a7faf44..6ec942c07fae 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -830,18 +830,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH) public boolean isEnabled() { - try { - mServiceLock.readLock().lock(); - if (mService != null) { - return mService.isEnabled(); - } - } catch (RemoteException e) { - Log.e(TAG, "", e); - } finally { - mServiceLock.readLock().unlock(); - } - - return false; + return getState() == BluetoothAdapter.STATE_ON; } /** |