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

Commit b5d9cd0d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dial WPS call over IMS or CS per... 

Merge "Dial WPS call over IMS or CS per CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL" into qt-dev
parents a36dcf26 1481f324

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

+10 −1
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ public class GsmCdmaPhone extends Phone { 
    private static final String VM_NUMBER_CDMA = "vm_number_key_cdma";

    public static final int RESTART_ECM_TIMER = 0; // restart Ecm timer

    public static final int CANCEL_ECM_TIMER = 1; // cancel Ecm timer

    private static final String PREFIX_WPS = "*272";

    private CdmaSubscriptionSourceManager mCdmaSSM;

    public int mCdmaSubscriptionSource = CdmaSubscriptionSourceManager.SUBSCRIPTION_SOURCE_UNKNOWN;

    private PowerManager.WakeLock mWakeLock;
@@ -1178,11 +1179,17 @@ public class GsmCdmaPhone extends Phone { 
        boolean alwaysTryImsForEmergencyCarrierConfig = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL);



        /** Check if the call is Wireless Priority Service call */

        boolean isWpsCall = dialString != null ? dialString.startsWith(PREFIX_WPS) : false;

        boolean allowWpsOverIms = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL);



        boolean useImsForCall = isImsUseEnabled()

                 && imsPhone != null

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

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

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

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

                 && (isWpsCall ? allowWpsOverIms : true);



        boolean useImsForEmergency = imsPhone != null

                && isEmergency
@@ -1202,6 +1209,8 @@ public class GsmCdmaPhone extends Phone { 
                    + ", useImsForEmergency=" + useImsForEmergency

                    + ", useImsForUt=" + useImsForUt

                    + ", isUt=" + isUt

                    + ", isWpsCall=" + isWpsCall

                    + ", allowWpsOverIms=" + allowWpsOverIms

                    + ", imsPhone=" + imsPhone

                    + ", imsPhone.isVolteEnabled()="

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