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

Commit d8b099fe authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Pavlin Radoslavov
Browse files

Inform AVRCP Controller before cleaning up. 

Move the JNI callback earlier in the procedure before the device info is
zeroed out such that the higher levels know which device disconnected.

Bug: 80265765
Test: Disconnect AVRCP and verify bluetooth_manager reports it is
disconnected.

Change-Id: I1c69341227f4c1c1662022a4a77e1752f6306d2e
parent 964df17e

system/btif/src/btif_rc.cc

+6 −6
Original line number Diff line number Diff line
@@ -676,6 +676,12 @@ void handle_rc_disconnect(tBTA_AV_RC_CLOSE* p_rc_close) { 
    BTIF_TRACE_ERROR("Got disconnect of unknown device");

    return;

  }

  /* report connection state if device is AVRCP target */

  if (bt_rc_ctrl_callbacks != NULL) {

    do_in_jni_thread(

        FROM_HERE, base::Bind(bt_rc_ctrl_callbacks->connection_state_cb, false,

                              false, p_dev->rc_addr));

  }

  /* Clean up AVRCP procedure flags */

  memset(&p_dev->rc_app_settings, 0, sizeof(btif_rc_player_app_settings_t));

  p_dev->rc_features_processed = false;
@@ -707,12 +713,6 @@ void handle_rc_disconnect(tBTA_AV_RC_CLOSE* p_rc_close) { 
  }



  p_dev->rc_addr = RawAddress::kEmpty;

  /* report connection state if device is AVRCP target */

  if (bt_rc_ctrl_callbacks != NULL) {

    do_in_jni_thread(

        FROM_HERE, base::Bind(bt_rc_ctrl_callbacks->connection_state_cb, false,

                              false, p_dev->rc_addr));

  }

}



/***************************************************************************