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

Commit bbceb923 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Don't use bta_dm_get_remname outside of device_search.cc 

This is never used. Please see 10 year old TODO in BondStateMachine.java
being removed.

Bug: 330675788
Flag: exempt, trivial patch
Test: mma -j32
Change-Id: I244a570babaec03592cecdbf098beb10c8b80f69
parent d362b840

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+4 −15
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ static void pin_request_callback(RawAddress* bd_addr, bt_bdname_t* bdname, 
                               addr.get(), devname.get(), cod, min_16_digits);

}



static void ssp_request_callback(RawAddress* bd_addr, bt_bdname_t* bdname,

                                 uint32_t cod, bt_ssp_variant_t pairing_variant,

static void ssp_request_callback(RawAddress* bd_addr,

                                 bt_ssp_variant_t pairing_variant,

                                 uint32_t pass_key) {

  if (!bd_addr) {

    log::error("Address is null");
@@ -535,19 +535,8 @@ static void ssp_request_callback(RawAddress* bd_addr, bt_bdname_t* bdname, 
  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                   (jbyte*)bd_addr);



  ScopedLocalRef<jbyteArray> devname(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdname_t)));

  if (!devname.get()) {

    log::error("Error while allocating");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(devname.get(), 0, sizeof(bt_bdname_t),

                                   (jbyte*)bdname);



  sCallbackEnv->CallVoidMethod(sJniCallbacksObj, method_sspRequestCallback,

                               addr.get(), devname.get(), cod,

                               (jint)pairing_variant, pass_key);

                               addr.get(), (jint)pairing_variant, pass_key);

}



static jobject createClassicOobDataObject(JNIEnv* env, bt_oob_data_t oob_data) {
@@ -2273,7 +2262,7 @@ int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) { 
       &method_devicePropertyChangedCallback},

      {"deviceFoundCallback", "([B)V", &method_deviceFoundCallback},

      {"pinRequestCallback", "([B[BIZ)V", &method_pinRequestCallback},

      {"sspRequestCallback", "([B[BIII)V", &method_sspRequestCallback},

      {"sspRequestCallback", "([BII)V", &method_sspRequestCallback},

      {"bondStateChangeCallback", "(I[BII)V", &method_bondStateChangeCallback},

      {"addressConsolidateCallback", "([B[B)V",

       &method_addressConsolidateCallback},

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+1 −5
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashSet;

import java.util.Objects;

import java.util.Optional;
@@ -593,15 +592,12 @@ final class BondStateMachine extends StateMachine { 
    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    void sspRequestCallback(byte[] address, byte[] name, int cod, int pairingVariant, int passkey) {

        //TODO(BT): Get wakelock and update name and cod

    void sspRequestCallback(byte[] address, int pairingVariant, int passkey) {

        BluetoothDevice bdDevice = mRemoteDevices.getDevice(address);

        if (bdDevice == null) {

            mRemoteDevices.addDeviceProperties(address);

        }

        infoLog("sspRequestCallback: " + Utils.getRedactedAddressStringFromByte(address)

                + " name: " + Arrays.toString(name)

                + " cod: " + cod

                + " pairingVariant " + pairingVariant

                + " passkey: " + (Build.isDebuggable() ? passkey : "******"));

        int variant;

android/app/src/com/android/bluetooth/btservice/JniCallbacks.java

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ class JniCallbacks { 
        throw new CloneNotSupportedException();

    }



    void sspRequestCallback(byte[] address, byte[] name, int cod, int pairingVariant, int passkey) {

        mBondStateMachine.sspRequestCallback(address, name, cod, pairingVariant, passkey);

    void sspRequestCallback(byte[] address, int pairingVariant, int passkey) {

        mBondStateMachine.sspRequestCallback(address, pairingVariant, passkey);

    }



    void devicePropertyChangedCallback(byte[] address, int[] types, byte[][] val) {

system/bta/dm/bta_dm_sec.cc

+1 −3
Original line number Diff line number Diff line
@@ -721,9 +721,7 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 


    case BTM_LE_NC_REQ_EVT:

      sec_event.key_notif.bd_addr = bda;

      // TODO: get rid of this

      bd_name_from_char_pointer(sec_event.key_notif.bd_name,

                                bta_dm_get_remname());

      bd_name_clear(sec_event.key_notif.bd_name);

      sec_event.key_notif.passkey = p_data->key_notif;

      bta_dm_sec_cb.p_sec_cback(BTA_DM_BLE_NC_REQ_EVT, &sec_event);

      break;

system/btif/include/btif_common.h

+1 −2
Original line number Diff line number Diff line
@@ -154,8 +154,7 @@ void invoke_device_found_cb(int num_properties, bt_property_t* properties); 
void invoke_discovery_state_changed_cb(bt_discovery_state_t state);

void invoke_pin_request_cb(RawAddress bd_addr, bt_bdname_t bd_name,

                           uint32_t cod, bool min_16_digit);

void invoke_ssp_request_cb(RawAddress bd_addr, bt_bdname_t bd_name,

                           uint32_t cod, bt_ssp_variant_t pairing_variant,

void invoke_ssp_request_cb(RawAddress bd_addr, 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, RawAddress raw_address,