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

Commit c1fdc30e authored by Zixuan Qu's avatar Zixuan Qu Committed by Automerger Merge Worker
Browse files

Merge "Fix potential null pointer derefence on bt_rc_ctrl_callbacks." into main am: 13ba5523 

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



Change-Id: I8c27cdb1f0dcc7c0d934f066af30feccf130db2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c434641a 13ba5523

system/btif/src/btif_rc.cc

+8 −3
Original line number Diff line number Diff line
@@ -813,9 +813,14 @@ void handle_rc_browse_connect(tBTA_AV_RC_BROWSE_OPEN* p_rc_br_open) { 
        LOG_VERBOSE("%s: pending rc browse connection event", __func__);

      }

    } else {

      do_in_jni_thread(FROM_HERE,

                       base::BindOnce(bt_rc_ctrl_callbacks->connection_state_cb,

                                      true, true, p_dev->rc_addr));

        if (bt_rc_ctrl_callbacks != NULL) {

          do_in_jni_thread(

              FROM_HERE,

              base::BindOnce(bt_rc_ctrl_callbacks->connection_state_cb, true,

                             true, p_dev->rc_addr));

        } else {

            LOG_WARN("%s: bt_rc_ctrl_callbacks is null.", __func__);

        }

    }

  }

}