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

Commit 5a0be47b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in BT audio connected states." into main

parents 8e8e2bd6 29cd27bf

src/com/android/server/telecom/CallAudioRouteController.java

+2 −2
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
     * Message being handled: BT_AUDIO_CONNECTED

     */

    private void handleBtAudioActive(BluetoothDevice bluetoothDevice) {

        if (mIsPending) {

        if (mIsPending && bluetoothDevice != null) {

            Log.i(this, "handleBtAudioActive: is pending path");

            if (Objects.equals(mPendingAudioRoute.getDestRoute().getBluetoothAddress(),

                    bluetoothDevice.getAddress())) {
@@ -778,7 +778,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
     * Message being handled: BT_AUDIO_DISCONNECTED

     */

    private void handleBtAudioInactive(BluetoothDevice bluetoothDevice) {

        if (mIsPending) {

        if (mIsPending && bluetoothDevice != null) {

            Log.i(this, "handleBtAudioInactive: is pending path");

            if (Objects.equals(mPendingAudioRoute.getOrigRoute().getBluetoothAddress(),

                    bluetoothDevice.getAddress())) {