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

Commit 4ed16615 authored by Grace Jia's avatar Grace Jia Committed by Automerger Merge Worker
Browse files

Set visibleToInCallService to true if the extra is null. am: 038b224b 

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

Change-Id: Ib0476303d89ae7fc0b243119772d8cf0f149c246
parents 7d43f35f 038b224b

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

+4 −4
Original line number Diff line number Diff line
@@ -1288,8 +1288,8 @@ public class CallsManager extends Call.ListenerBase 
            if (call.isSelfManaged()) {

                // Self managed calls will always be voip audio mode.

                call.setIsVoipAudioMode(true);

                call.setVisibleToInCallService(phoneAccountExtras != null

                        && phoneAccountExtras.getBoolean(

                call.setVisibleToInCallService(phoneAccountExtras == null

                        || phoneAccountExtras.getBoolean(

                        PhoneAccount.EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE, true));

            } else {

                // Incoming call is managed, the active call is self-managed and can't be held.
@@ -1554,8 +1554,8 @@ public class CallsManager extends Call.ListenerBase 
            if (isSelfManaged) {

                // Self-managed calls will ALWAYS use voip audio mode.

                call.setIsVoipAudioMode(true);

                call.setVisibleToInCallService(phoneAccountExtra != null

                        && phoneAccountExtra.getBoolean(

                call.setVisibleToInCallService(phoneAccountExtra == null

                        || phoneAccountExtra.getBoolean(

                                PhoneAccount.EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE, true));

            }

            call.setInitiatingUser(initiatingUser);