Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fee4546f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "incl_svc_parsing_fix" 

* changes:
  Fix included service parsing (3/3)
  Bluetooth: fix typo in comment
parents 1bbf2878 8dde5e1c

core/java/android/bluetooth/BluetoothGatt.java

+3 −5
Original line number Diff line number Diff line
@@ -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