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

Commit 9c6dd03e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add binder interface for the BluetoothConnectionCallback" am:... 

Merge "Add binder interface for the BluetoothConnectionCallback" am: 47a0ce90 am: aaefc147 am: 36b10ab8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1480389

Change-Id: Ia6eabe08f3f81315f2b118a5f26a0629ccc2926d
parents 07156a8a 36b10ab8

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);

}