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

Commit 3a7a35d6 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Filter invalid handover requests." am: f30e41f3 am: b3e1336a 

am: 432dbfd2

Change-Id: I10d69826b69baebd755a5408424f827e73a8f995
parents 7d69393d 432dbfd2

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+8 −5
Original line number Diff line number Diff line
@@ -2326,16 +2326,19 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    targetAccessTech + ", reasonInfo=" + reasonInfo);

            }



            boolean isHandoverToWifi = srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN &&

                    targetAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            // Only consider it a valid handover to WIFI if the source radio tech is known.

            boolean isHandoverToWifi = srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN

                    && srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                    && targetAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            if (isHandoverToWifi) {

                // If we handed over to wifi successfully, don't check for failure in the future.

                removeMessages(EVENT_CHECK_FOR_WIFI_HANDOVER);

            }



            boolean isHandoverFromWifi =

                    srcAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN &&

                            targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            // Only consider it a handover from WIFI if the source and target radio tech is known.

            boolean isHandoverFromWifi = srcAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                    && targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN

                    && targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            if (mNotifyHandoverVideoFromWifiToLTE && isHandoverFromWifi && imsCall.isVideoCall()) {

                log("onCallHandover :: notifying of WIFI to LTE handover.");

                ImsPhoneConnection conn = findConnection(imsCall);