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

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

Snap for 6943286 from a379b3eb to sc-release 

Change-Id: I22810524ea70240aeabdf9a3707455cb4d139f87
parents f8a76381 a379b3eb

system/binder/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_library_shared { 
        "android/bluetooth/le/IAdvertisingSetCallback.aidl",

        "android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",

        "android/bluetooth/le/IScannerCallback.aidl"

        "android/bluetooth/IBluetoothConnectionCallback.aidl",

        */

    ],

    export_include_dirs: ["./"],
@@ -115,5 +116,6 @@ filegroup { 
        "android/bluetooth/le/IAdvertisingSetCallback.aidl",

        "android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",

        "android/bluetooth/le/IScannerCallback.aidl",

        "android/bluetooth/IBluetoothConnectionCallback.aidl",

    ],

}

system/binder/android/bluetooth/IBluetooth.aidl

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;



import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothConnectionCallback;

import android.bluetooth.IBluetoothMetadataListener;

import android.bluetooth.IBluetoothSocketManager;

import android.bluetooth.IBluetoothStateChangeCallback;
@@ -144,8 +145,9 @@ interface IBluetooth 
    boolean disconnectAllEnabledProfiles(in BluetoothDevice device);



    boolean setActiveDevice(in BluetoothDevice device, in int profiles);



    List<BluetoothDevice> getMostRecentlyConnectedDevices();



    boolean removeActiveDevice(in int profiles);



    boolean registerBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);

    boolean unregisterBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);

}

system/binder/android/bluetooth/IBluetoothConnectionCallback.aidl

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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.

 */

package android.bluetooth;



import android.bluetooth.BluetoothDevice;



/**

 * Callback definitions for identifying when an ACL connection or disconnection happens

 * @hide

 */

oneway interface IBluetoothConnectionCallback {

    void onDeviceConnected(in BluetoothDevice device);

    void onDeviceDisconnected(in BluetoothDevice device);

}

system/btif/src/btif_config.cc

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type) { 
  if (!btif_config_get_int(bd_addr_str, "AddrType", &val)) return false;

  *p_addr_type = static_cast<tBLE_ADDR_TYPE>(val);



  LOG_INFO("Device [%s] address type %d", bd_addr_str, *p_addr_type);

  LOG_DEBUG("Device [%s] address type %s", bd_addr_str,

            AddressTypeText(*p_addr_type).c_str());

  return true;

}

system/gd/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -762,3 +762,12 @@ cc_library_host_shared { 
    ],

    rtti: true,

}



rust_protobuf {

    name: "libhci_layer_facade_proto",

    crate_name: "hci_layer_facade_proto",

    proto: "hci/facade/facade.proto",

    proto_flags: ["-Iexternal/protobuf/src/"],

    source_stem: "facade",

    host_supported: true,

}