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

Commit 91a1e2b9 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Fix crash during outgoing call + incoming SM call am: de70f555 am: 35b41c51 

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



Change-Id: I74b98771ace7abefe981556ba6248f9256361d2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a45e9d30 35b41c51

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

+9 −3
Original line number Diff line number Diff line
@@ -4738,14 +4738,20 @@ public class CallsManager extends Call.ListenerBase 


    /**

     * Determines the number of unholdable calls present in a connection service other than the one

     * the passed phone account belonds to.

     * the passed phone account belongs to. If a ConnectionService has not been associated with an

     * outgoing call yet (for example, it is in the SELECT_PHONE_ACCOUNT state), then we do not

     * count that call because it is not tracked as an active call yet.

     * @param phoneAccountHandle The handle of the PhoneAccount.

     * @return Number of unholdable calls owned by other connection service.

     */

    public int getNumUnholdableCallsForOtherConnectionService(

            PhoneAccountHandle phoneAccountHandle) {

        return (int) mCalls.stream().filter(call ->

                !phoneAccountHandle.getComponentName().equals(

                // If this convention needs to be changed, answerCall will need to be modified to

                // change what an "active call" is so that the call in SELECT_PHONE_ACCOUNT state

                // will be properly cancelled.

                call.getTargetPhoneAccount() != null

                        && !phoneAccountHandle.getComponentName().equals(

                                call.getTargetPhoneAccount().getComponentName())

                        && call.getParentCall() == null

                        && !call.isExternalCall()