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

Commit a102cf27 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7230642 from e9c34cf6 to sc-release 

Change-Id: I9c73addbff8aeff7483130a89786f35a4423351f
parents 21aa5d75 e9c34cf6

system/binder/android/bluetooth/IBluetooth.aidl

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ interface IBluetooth 
    int getRemoteType(in BluetoothDevice device);

    @UnsupportedAppUsage

    String getRemoteAlias(in BluetoothDevice device);

    boolean setRemoteAlias(in BluetoothDevice device, in String name);

    boolean setRemoteAlias(in BluetoothDevice device, in String name, in String callingPackage);

    int getRemoteClass(in BluetoothDevice device);

    ParcelUuid[] getRemoteUuids(in BluetoothDevice device);

    @UnsupportedAppUsage

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ cc_test { 
        "test/common/mock_stack_btm_sec.cc",

        "test/common/mock_stack_crypto_toolbox_aes_cmac.cc",

        "test/common/mock_stack_gap_ble.cc",

        "test/common/mock_stack_btm_main.cc",

        "test/common/mock_stack_gatt.cc",

        "test/common/mock_stack_gatt_attr.cc",

        "test/common/mock_stack_gatt_connection_manager.cc",

system/bta/av/bta_av_aact.cc

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/l2c_api.h"

#include "types/hci_role.h"



namespace {

system/bta/av/bta_av_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "osi/include/osi.h"  // UNUSED_ATTR

#include "osi/include/properties.h"

#include "stack/include/acl_api.h"

#include "types/hci_role.h"



/*****************************************************************************

 * Constants and types

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -617,7 +617,8 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
     * disconnected */

    for (int i = 0; i < bta_dm_cb.device_list.count; i++) {

      auto& peer_device = bta_dm_cb.device_list.peer_device[i];

      if (peer_device.peer_bdaddr == other_address) {

      if (peer_device.peer_bdaddr == other_address &&

          peer_device.transport == other_transport) {

        peer_device.conn_state = BTA_DM_UNPAIRING;



        /* Make sure device is not in acceptlist before we disconnect */