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

Commit 683a7184 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Partner Code Review
Browse files

Merge "IMS: Initiate Video Lte and Wifi calls over IMS" into mm-wireless-dev

parents 7689ce94 5d3ff3cf

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1061,7 +1061,8 @@ public class GsmCdmaPhone extends Phone { 




        boolean imsUseEnabled = isImsUseEnabled()

        boolean imsUseEnabled = isImsUseEnabled()

                 && imsPhone != null

                 && imsPhone != null

                 && (imsPhone.isVolteEnabled() || imsPhone.isWifiCallingEnabled())

                 && (imsPhone.isVolteEnabled() || imsPhone.isWifiCallingEnabled() ||

                 (imsPhone.isVideoEnabled() && VideoProfile.isVideo(videoState)))

                 && (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);

                 && (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);





        boolean useImsForEmergency = imsPhone != null

        boolean useImsForEmergency = imsPhone != null
@@ -1085,6 +1086,8 @@ public class GsmCdmaPhone extends Phone { 
                    + ((imsPhone != null) ? imsPhone.isVolteEnabled() : "N/A")

                    + ((imsPhone != null) ? imsPhone.isVolteEnabled() : "N/A")

                    + ", imsPhone.isVowifiEnabled()="

                    + ", imsPhone.isVowifiEnabled()="

                    + ((imsPhone != null) ? imsPhone.isWifiCallingEnabled() : "N/A")

                    + ((imsPhone != null) ? imsPhone.isWifiCallingEnabled() : "N/A")

                    + ", imsPhone.isVideoEnabled()="

                    + ((imsPhone != null) ? imsPhone.isVideoEnabled() : "N/A")

                    + ", imsPhone.getServiceState().getState()="

                    + ", imsPhone.getServiceState().getState()="

                    + ((imsPhone != null) ? imsPhone.getServiceState().getState() : "N/A"));

                    + ((imsPhone != null) ? imsPhone.getServiceState().getState() : "N/A"));

        }

        }