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

Commit 77a14deb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "OOB: Implement generateLocalOobData API"

parents 177ea02c bbe7f090

system/binder/Android.bp

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

        "android/bluetooth/IBluetoothMetadataListener.aidl",

        "android/bluetooth/IBluetoothGattServerCallback.aidl",

        "android/bluetooth/IBluetoothOobDataCallback.aidl",

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

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

        "android/bluetooth/le/IScannerCallback.aidl"
@@ -123,6 +124,7 @@ filegroup { 
        "android/bluetooth/IBluetoothGattCallback.aidl",

        "android/bluetooth/IBluetoothMetadataListener.aidl",

        "android/bluetooth/IBluetoothGattServerCallback.aidl",

        "android/bluetooth/IBluetoothOobDataCallback.aidl",

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

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

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

system/binder/android/bluetooth/IBluetooth.aidl

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.bluetooth; 
import android.bluetooth.IBluetoothCallback;

import android.bluetooth.IBluetoothConnectionCallback;

import android.bluetooth.IBluetoothMetadataListener;

import android.bluetooth.IBluetoothOobDataCallback;

import android.bluetooth.IBluetoothSocketManager;

import android.bluetooth.IBluetoothStateChangeCallback;

import android.bluetooth.BluetoothActivityEnergyInfo;
@@ -151,4 +152,6 @@ interface IBluetooth 


    boolean registerBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);

    boolean unregisterBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);



    void generateLocalOobData(in int transport, IBluetoothOobDataCallback callback);

}

system/binder/android/bluetooth/IBluetoothOobDataCallback.aidl

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

 * Copyright 2021 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.IBluetooth;

import android.bluetooth.OobData;



/**

 * API for receiving OobData from the host stack

 *

 * {@hide}

 */

oneway interface IBluetoothOobDataCallback {

    void onOobData(int transport, in OobData oobData);

    void onError(int errorCode);

}

system/btif/include/btif_common.h

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ void invoke_pin_request_cb(RawAddress bd_addr, bt_bdname_t bd_name, 
void invoke_ssp_request_cb(RawAddress bd_addr, bt_bdname_t bd_name,

                           uint32_t cod, bt_ssp_variant_t pairing_variant,

                           uint32_t pass_key);

void invoke_oob_data_request_cb(tBT_TRANSPORT t, bool valid, Octet16 c,

                                Octet16 r);

void invoke_bond_state_changed_cb(bt_status_t status, RawAddress bd_addr,

                                  bt_bond_state_t state);

void invoke_acl_state_changed_cb(bt_status_t status, RawAddress bd_addr,

system/btif/include/btif_dm.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ void btif_dm_load_local_oob(void); 
void btif_dm_proc_loc_oob(bool valid, const Octet16& c, const Octet16& r);

bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,

                          Octet16* p_r);

void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);

#endif /* BTIF_DM_OOB_TEST */



/*callout for reading SMP properties from Text file*/