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

Commit 2f074a91 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system/btif/src: Update FAIL with more descriptive error codes" into... 

Merge "system/btif/src: Update FAIL with more descriptive error codes" into main am: c0f81bb3 am: d2f4e71f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3107150



Change-Id: I685cb69b9e11eeea17aa360fff643df39c65f0d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7c68f6a d2f4e71f

system/btif/src/btif_dm.cc

+3 −3
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
                                             pairing_cb.pin_code_len);

      } else {

        log::warn("bd_addr is empty");

        ret = BT_STATUS_FAIL;

        ret = BT_STATUS_PARM_INVALID;

      }

      ASSERTC(ret == BT_STATUS_SUCCESS, "storing link key failed", ret);

    } else {
@@ -1381,7 +1381,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        break;



      default:

        status = BT_STATUS_FAIL;

        status = BT_STATUS_UNHANDLED;

    }

    /* Special Handling for HID Devices */

    if (check_cod_hid_major(bd_addr, COD_HID_POINTING)) {
@@ -3682,7 +3682,7 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        break;

      default:

        btif_dm_remove_ble_bonding_keys();

        status = BT_STATUS_FAIL;

        status = BT_STATUS_UNHANDLED;

        break;

    }

  }