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

Commit 23e35c30 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "avoid NullPointerException" into main am: 0c33bd4c 

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



Change-Id: I505cdb87803ccaddd89dfe35c27c88101d173151
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e03d32c5 0c33bd4c

android/app/src/com/android/bluetooth/telephony/BluetoothInCallService.java

+4 −2
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ public class BluetoothInCallService extends InCallService { 
        }



        public void onParentChanged(BluetoothCall call) {

            if (call.isExternalCall()) {

            if (mCallInfo.isNullCall(call) || call.isExternalCall()) {

                Log.w(TAG, "null call or external call");

                return;

            }

            if (call.getParentId() != null) {
@@ -314,7 +315,8 @@ public class BluetoothInCallService extends InCallService { 
        }



        public void onChildrenChanged(BluetoothCall call, List<BluetoothCall> children) {

            if (call.isExternalCall()) {

            if (mCallInfo.isNullCall(call) || call.isExternalCall()) {

                Log.w(TAG, "null call or external call");

                return;

            }

            if (call.getChildrenIds().size() == 1) {