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

Commit 3603c3cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix null pointer access in handle_rc_ctrl_features" am: a87fbe48 am:... 

Merge "Fix null pointer access in handle_rc_ctrl_features" am: a87fbe48 am: 30b29e6a am: 7a569307

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



Change-Id: Ibcb554d8b9d7d1c5f20e3847c579ea8841268ff0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cacd3b9 7a569307

system/btif/src/btif_rc.cc

+5 −5
Original line number Diff line number Diff line
@@ -734,13 +734,13 @@ void handle_rc_connect(tBTA_AV_RC_OPEN* p_rc_open) { 
    do_in_jni_thread(FROM_HERE,

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

                                false, p_dev->rc_addr));

  }

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

    handle_rc_ctrl_features(p_dev);



    /* report psm if remote device is AVRCP target */

    handle_rc_ctrl_psm(p_dev);

  }

}



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

 *  Function       handle_rc_disconnect