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

Commit dd8c4d54 authored by Qing Zhong's avatar Qing Zhong Committed by Automerger Merge Worker
Browse files

Merge "Prevent null pointer exception in getCurrentCall method" am: 4f0f737e 

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



Change-Id: I7167cc5a97d7aa8a88956dfde0f4911f38aa09ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 377b8376 4f0f737e

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java

+4 −2
Original line number Diff line number Diff line
@@ -608,10 +608,12 @@ public class HeadsetClientService extends ProfileService { 
                List<BluetoothHeadsetClientCall> defaultValue = new ArrayList<>();

                if (service != null) {

                    List<HfpClientCall> calls = service.getCurrentCalls(device);

                    if (calls != null) {

                        for (HfpClientCall call : calls) {

                            defaultValue.add(toLegacyCall(call));

                        }

                    }

                }

                receiver.send(defaultValue);

            } catch (RuntimeException e) {

                receiver.propagateException(e);