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

Commit e359b683 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20627 

* changes:
  Add ro.telephony.disable-call check in dialing.
parents 1fd459f2 597f2b70

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+5 −0
Original line number Diff line number Diff line
@@ -115,4 +115,9 @@ public interface TelephonyProperties 
     */

    static final String PROPERTY_OTASP_NUM_SCHEMA = "ro.cdma.otaspnumschema";



    /**

     * Disable all calls including Emergency call when it set to true.

     */

    static final String PROPERTY_DISABLE_CALL = "ro.telephony.disable-call";



}

telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

+7 −4
Original line number Diff line number Diff line
@@ -321,10 +321,13 @@ public final class CdmaCallTracker extends CallTracker { 
    canDial() {

        boolean ret;

        int serviceState = phone.getServiceState().getState();

        String disableCall = SystemProperties.get(

                TelephonyProperties.PROPERTY_DISABLE_CALL, "false");



        ret = (serviceState != ServiceState.STATE_POWER_OFF) &&

                pendingMO == null

        ret = (serviceState != ServiceState.STATE_POWER_OFF)

                && pendingMO == null

                && !ringingCall.isRinging()

                && !disableCall.equals("true")

                && (!foregroundCall.getState().isAlive()

                    || (foregroundCall.getState() == CdmaCall.State.ACTIVE)

                    || !backgroundCall.getState().isAlive());

telephony/java/com/android/internal/telephony/gsm/GsmCallTracker.java

+6 −3
Original line number Diff line number Diff line
@@ -294,10 +294,13 @@ public final class GsmCallTracker extends CallTracker { 
    canDial() {

        boolean ret;

        int serviceState = phone.getServiceState().getState();

        String disableCall = SystemProperties.get(

                TelephonyProperties.PROPERTY_DISABLE_CALL, "false");



        ret = (serviceState != ServiceState.STATE_POWER_OFF) &&

                pendingMO == null

        ret = (serviceState != ServiceState.STATE_POWER_OFF)

                && pendingMO == null

                && !ringingCall.isRinging()

                && !disableCall.equals("true")

                && (!foregroundCall.getState().isAlive()

                    || !backgroundCall.getState().isAlive());