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

Commit 937e96b8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['android-review.googlesource.com/3290444',... 

Merge cherrypicks of ['android-review.googlesource.com/3290444', 'googleplex-android-review.googlesource.com/29760873'] into 24Q4-release.

Change-Id: I779ffa7d9259f267abab3219914adad23a3b6704
parents 5ef6e310 38ad7826

android/app/src/com/android/bluetooth/gatt/GattService.java

+0 −3
Original line number Diff line number Diff line
@@ -142,15 +142,12 @@ public class GattService extends ProfileService { 
                "0201061AFF4C000215426C7565436861726D426561636F6E730EFE1355C509168020691E0EFE13551109426C7565436861726D5F31363936383500000000",

            };



<<<<<<< HEAD   (9f43bf Send preferred MTU from GattService to native GATT module)

=======

    private static final Integer GATT_MTU_MAX = 517;

    private static final Map<String, Integer> EARLY_MTU_EXCHANGE_PACKAGES =

            Map.of("com.teslamotors.tesla", GATT_MTU_MAX);



    @VisibleForTesting static final int GATT_CLIENT_LIMIT_PER_APP = 32;



>>>>>>> CHANGE (ea9b83 Add ATT MTU preference for Tesla app)

    public final TransitionalScanHelper mTransitionalScanHelper =

            new TransitionalScanHelper(this, this::isTestModeEnabled);

system/btif/src/btif_gatt_client.cc

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ void btif_gattc_open_impl(int client_if, RawAddress address, tBLE_ADDR_TYPE addr 


      default:

        log::error("Unknown device type {}", DeviceTypeText(device_type));

        // transport must not be AUTO for finding control blocks. Use LE for backward compatibility.

        transport = BT_TRANSPORT_LE;

        break;

    }

  }

system/btif/src/btif_gatt_server.cc

+4 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ static void btif_gatts_open_impl(int server_if, const RawAddress& address, bool 


      default:

        log::error("Unknown device type {}", DeviceTypeText(device_type));

        // transport must not be AUTO for finding control blocks. Use LE for backward compatibility.

        transport = BT_TRANSPORT_LE;

        break;

    }

  }
@@ -355,6 +357,8 @@ static void btif_gatts_open_impl_use_address_type(int server_if, const RawAddres 


      default:

        log::error("Unknown device type {}", DeviceTypeText(device_type));

        // transport must not be AUTO for finding control blocks. Use LE for backward compatibility.

        transport = BT_TRANSPORT_LE;

        break;

    }

  }