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

Commit 228f95ee authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Merge commit '005612a0' into tgunn-merge1 

Change-Id: Ibf955c5361978fadda363af97e975672d8a5f197
parents 131e31f4 005612a0

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

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ public class CallIntentProcessor { 
            clientExtras.putString(TelecomManager.EXTRA_CALL_SUBJECT, callsubject);

        }



        final int videoState = intent.getIntExtra( TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,

                VideoProfile.STATE_AUDIO_ONLY);

        clientExtras.putInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState);



        final boolean isPrivilegedDialer = intent.getBooleanExtra(KEY_IS_PRIVILEGED_DIALER, false);



        boolean fixedInitiatingUser = fixInitiatingUserIfNecessary(context, intent);

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

+7 −0
Original line number Diff line number Diff line
@@ -763,6 +763,13 @@ public class CallsManager extends Call.ListenerBase 
            isReusedCall = false;

        }



        // Set the video state on the call early so that when it is added to the InCall UI the UI

        // knows to configure itself as a video call immediately.

        if (extras != null) {

            call.setVideoState(extras.getInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,

                    VideoProfile.STATE_AUDIO_ONLY));

        }



        List<PhoneAccountHandle> accounts =

                mPhoneAccountRegistrar.getCallCapablePhoneAccounts(handle.getScheme(), false,

                        initiatingUser);