From cf733cd020ab47ade9d4fb5d3e85549e1bb2d561 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 14 Sep 2017 08:51:44 -0700 Subject: Bluetooth: fix typo in comment Test: none Change-Id: I48c674049df88285268145d4140870eb4ab79a62 --- core/java/android/bluetooth/BluetoothGatt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index 83a82f7f8353..75f3f62e9371 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -913,7 +913,7 @@ public final class BluetoothGatt implements BluetoothProfile { /** * Set the preferred connection PHY for this app. Please note that this is just a - * recommendation, whether the PHY change will happen depends on other applications peferences, + * recommendation, whether the PHY change will happen depends on other applications preferences, * local and remote controller capabilities. Controller can override these settings. *

* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even -- cgit v1.2.3-59-g8ed1b From 8dde5e1ce093bfdbeee523b4f94a93b6598e5b6f Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 14 Sep 2017 11:54:59 -0700 Subject: Fix included service parsing (3/3) Bug: 65637368 Test: sl4a GattIncludedServiceTest Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c --- core/java/android/bluetooth/BluetoothGatt.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index 75f3f62e9371..a2af3422eaec 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -311,8 +311,7 @@ public final class BluetoothGatt implements BluetoothProfile { for (BluetoothGattService brokenRef : includedServices) { BluetoothGattService includedService = getService(mDevice, - brokenRef.getUuid(), brokenRef.getInstanceId(), - brokenRef.getType()); + brokenRef.getUuid(), brokenRef.getInstanceId()); if (includedService != null) { fixedService.addIncludedService(includedService); } else { @@ -714,10 +713,9 @@ public final class BluetoothGatt implements BluetoothProfile { * @hide */ /*package*/ BluetoothGattService getService(BluetoothDevice device, UUID uuid, - int instanceId, int type) { + int instanceId) { for (BluetoothGattService svc : mServices) { if (svc.getDevice().equals(device) - && svc.getType() == type && svc.getInstanceId() == instanceId && svc.getUuid().equals(uuid)) { return svc; -- cgit v1.2.3-59-g8ed1b