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

Commit b3765941 authored by Suresh Koleti's avatar Suresh Koleti Committed by android-build-merger
Browse files

Merge "IMS: Allow USSD request in airplane mode" am: 478b77d3 

am: 7e6e9141

Change-Id: If932da08ab79a2dc73f0bd14ea64305494be3abc
parents d08da27a 7e6e9141

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1115,7 +1115,8 @@ public class GsmCdmaPhone extends Phone { 
        // Check non-emergency voice CS call - shouldn't dial when POWER_OFF

        // Check non-emergency voice CS call - shouldn't dial when POWER_OFF

        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_POWER_OFF /* CS POWER_OFF */

        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_POWER_OFF /* CS POWER_OFF */

                && !VideoProfile.isVideo(dialArgs.videoState) /* voice call */

                && !VideoProfile.isVideo(dialArgs.videoState) /* voice call */

                && !isEmergency /* non-emergency call */) {

                && !isEmergency /* non-emergency call */

                && !(isUt && useImsForUt) /* not UT */) {

            throw new CallStateException(

            throw new CallStateException(

                CallStateException.ERROR_POWER_OFF,

                CallStateException.ERROR_POWER_OFF,

                "cannot dial voice call in airplane mode");

                "cannot dial voice call in airplane mode");