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

Commit 925973b3 authored by Krzysztof Kopyscinski (xWF)'s avatar Krzysztof Kopyscinski (xWF) Committed by Automerger Merge Worker
Browse files

Merge "CallAudioRouteController: fix possible null pointer dereference in... 

Merge "CallAudioRouteController: fix possible  null pointer dereference in onAvailableRoutesChanged()" into main am: ca434bbc am: f8f25487

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/3274171



Change-Id: I8e772d736b403a0a70603a56d7553b256e217bf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02e26a50 f8f25487

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

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
                    BluetoothDevice deviceToAdd = mBluetoothRoutes.get(route);

                    // Only include the lead device for LE audio (otherwise, the routes will show

                    // two separate devices in the UI).

                    if (route.getType() == AudioRoute.TYPE_BLUETOOTH_LE

                    if (deviceToAdd != null && route.getType() == AudioRoute.TYPE_BLUETOOTH_LE

                            && getLeAudioService() != null) {

                        int groupId = getLeAudioService().getGroupId(deviceToAdd);

                        if (groupId != BluetoothLeAudio.GROUP_ID_INVALID) {