Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "incl_svc_parsing_fix"

Browse Source 
* changes:
  Fix included service parsing (3/3)
  Bluetooth: fix typo in comment
This commit is contained in:
Treehugger Robot
2017-09-14 22:59:37 +00:00
committed by Gerrit Code Review
parent 1bbf287859 8dde5e1ce0
commit fee4546fd6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/bluetooth/BluetoothGatt.java
View File

@@ -311,8 +311,7 @@ public final class BluetoothGatt implements BluetoothProfile {
for (BluetoothGattService brokenRef : includedServices) { for (BluetoothGattService brokenRef : includedServices) {
BluetoothGattService includedService = getService(mDevice, BluetoothGattService includedService = getService(mDevice,
brokenRef.getUuid(), brokenRef.getInstanceId(), brokenRef.getUuid(), brokenRef.getInstanceId());
brokenRef.getType());
if (includedService != null) { if (includedService != null) {
fixedService.addIncludedService(includedService); fixedService.addIncludedService(includedService);
} else { } else {
@@ -714,10 +713,9 @@ public final class BluetoothGatt implements BluetoothProfile {
* @hide * @hide
*/ */
/*package*/ BluetoothGattService getService(BluetoothDevice device, UUID uuid, /*package*/ BluetoothGattService getService(BluetoothDevice device, UUID uuid,
int instanceId, int type) { int instanceId) {
for (BluetoothGattService svc : mServices) { for (BluetoothGattService svc : mServices) {
if (svc.getDevice().equals(device) if (svc.getDevice().equals(device)
&& svc.getType() == type
&& svc.getInstanceId() == instanceId && svc.getInstanceId() == instanceId
&& svc.getUuid().equals(uuid)) { && svc.getUuid().equals(uuid)) {
return svc; return svc;
@@ -913,7 +911,7 @@ public final class BluetoothGatt implements BluetoothProfile {
/** /**
* Set the preferred connection PHY for this app. Please note that this is just a * 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. * local and remote controller capabilities. Controller can override these settings.
* <p> * <p>
* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even * {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even