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

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

Merge "Filter invalid handover requests." 

am: f30e41f3

Change-Id: I32bd1f90314a1f5ceff7f67b0785da1e36886bba
parents 69ee7f4e f30e41f3

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

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

                    targetAccessTech + ", reasonInfo=" + reasonInfo);

            }

            }





            boolean isHandoverToWifi = srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN &&

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

                    targetAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            boolean isHandoverToWifi = srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN

                    && srcAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                    && targetAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            if (isHandoverToWifi) {

            if (isHandoverToWifi) {

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

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

                removeMessages(EVENT_CHECK_FOR_WIFI_HANDOVER);

                removeMessages(EVENT_CHECK_FOR_WIFI_HANDOVER);

            }

            }





            boolean isHandoverFromWifi =

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

                    srcAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN &&

            boolean isHandoverFromWifi = srcAccessTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN

                            targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

                    && targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN

                    && targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

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

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

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

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

                ImsPhoneConnection conn = findConnection(imsCall);

                ImsPhoneConnection conn = findConnection(imsCall);