summaryrefslogtreecommitdiff
path: root/core/java/android/bluetooth/BluetoothManager.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-04-18 14:03:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-18 14:03:55 -0700
commitbf3e7d9efceb7b4232c5cc6f4dd2e2ea25e0f714 (patch)
tree3ae7f2d440b10983156788d1156528f1571a7f02 /core/java/android/bluetooth/BluetoothManager.java
parent17917a95f355634ba881cd3f587002cb7ef27ce6 (diff)
parentb2df0b60d0995c760fc7ee3776caa0fc7f84066a (diff)
am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev
* commit 'b2df0b60d0995c760fc7ee3776caa0fc7f84066a': Remove BluetoothAdapterCallback. Simplify leScan Api
Diffstat (limited to 'core/java/android/bluetooth/BluetoothManager.java')
-rw-r--r--core/java/android/bluetooth/BluetoothManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothManager.java b/core/java/android/bluetooth/BluetoothManager.java
index 19083b55dac2..172f3bcdefed 100644
--- a/core/java/android/bluetooth/BluetoothManager.java
+++ b/core/java/android/bluetooth/BluetoothManager.java
@@ -127,7 +127,7 @@ public final class BluetoothManager {
try {
IBluetoothManager managerService = mAdapter.getBluetoothManager();
- IBluetoothGatt iGatt = (IBluetoothGatt) managerService.getBluetoothGatt();
+ IBluetoothGatt iGatt = managerService.getBluetoothGatt();
if (iGatt == null) return connectedDevices;
connectedDevices = iGatt.getDevicesMatchingConnectionStates(
@@ -172,7 +172,7 @@ public final class BluetoothManager {
try {
IBluetoothManager managerService = mAdapter.getBluetoothManager();
- IBluetoothGatt iGatt = (IBluetoothGatt) managerService.getBluetoothGatt();
+ IBluetoothGatt iGatt = managerService.getBluetoothGatt();
if (iGatt == null) return devices;
devices = iGatt.getDevicesMatchingConnectionStates(states);
} catch (RemoteException e) {
@@ -203,7 +203,7 @@ public final class BluetoothManager {
try {
IBluetoothManager managerService = mAdapter.getBluetoothManager();
- IBluetoothGatt iGatt = (IBluetoothGatt) managerService.getBluetoothGatt();
+ IBluetoothGatt iGatt = managerService.getBluetoothGatt();
if (iGatt == null) {
Log.e(TAG, "Fail to get GATT Server connection");
return null;