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

Commit 84f57cd7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27887679', 'googleplex-android-review.googlesource.com/28268335'] into 24Q3-release.

Change-Id: I42626560d4de2b61db330ee280c6dfd60520145b
parents a046f942 989e7016

android/app/res/values-v35/styles.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<resources>



    <!--

        TODO(b/309578419): Make activities handle insets properly and then remove this.

    -->

    <style name="OptOutEdgeToEdgeEnforcement">

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>



</resources>

android/app/res/values/styles.xml

+6 −1
Original line number Diff line number Diff line
@@ -47,4 +47,9 @@ 


    <style name="dialog" parent="android:style/Theme.Material.Light.Dialog.Alert"/>



    <!--

        TODO(b/309578419): Make activities handle insets properly and then remove this.

    -->

    <style name="OptOutEdgeToEdgeEnforcement" />



</resources>

android/app/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ public class BluetoothOppTransferHistory extends Activity 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        // TODO(b/309578419): Make this activity handle insets properly and then remove this.

        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);



        setContentView(R.layout.bluetooth_transfers_page);

        mListView = (ListView) findViewById(R.id.list);

        mListView.setEmptyView(findViewById(R.id.empty));

system/stack/gatt/gatt_api.cc

+4 −4
Original line number Diff line number Diff line
@@ -1426,12 +1426,12 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, 


  bool ret = false;

  if (is_direct) {

    log::debug("Starting direct connect gatt_if={} address={}", gatt_if,

               bd_addr);

    log::debug("Starting direct connect gatt_if={} address={} transport={}", gatt_if, bd_addr,

               transport);

    bool tcb_exist = !!gatt_find_tcb_by_addr(bd_addr, transport);



    if (!com::android::bluetooth::flags::gatt_reconnect_on_bt_on_fix() ||

        tcb_exist) {

    if (!com::android::bluetooth::flags::gatt_reconnect_on_bt_on_fix() || tcb_exist ||

        transport == BT_TRANSPORT_BR_EDR) {

      /* Consider to remove gatt_act_connect at all */

      ret = gatt_act_connect(p_reg, bd_addr, addr_type, transport,

                             initiating_phys);