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" am: fee4546fd6

Browse Source 
am: 3aa179fabd

Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
This commit is contained in:
Jakub Pawlowski
2017-09-15 00:01:54 +00:00
committed by android-build-merger
parent 4de6420978 3aa179fabd
commit e22de0f23f
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) {
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;
@@ -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
* 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.
* <p>
* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even