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

Commit 7d1922ac authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Inform AVRCP Controller before cleaning up.

am: d8b099fe

Change-Id: I7a25750c7f5afa647a1706496d1941f2ac39261f
parents d0088fc7 d8b099fe
Loading
Loading
Loading
Loading
+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));
  }
}

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