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

Commit 5221dfde authored by Wink Saville's avatar Wink Saville
Browse files

Revert "Disable data call in emergency call" 

Temporary rollback of this change, for now the radio can prevent data traffic,
but that's not the desired long-term solution.

This reverts commit 79ef673d.
parent 542040c5

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

+0 −3
Original line number Diff line number Diff line
@@ -789,9 +789,6 @@ public class CDMAPhone extends PhoneBase { 
            Intent intent = new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS);

            ActivityManagerNative.broadcastStickyIntent(intent, null);

            return false;

        } else if ((mCT.state == Phone.State.OFFHOOK) && mCT.isInEmergencyCall()) {

            // Do not allow data call to be enabled when emergency call is going on

            return false;

        } else {

            return mDataConnection.setDataEnabled(true);

        }

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

+0 −30
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ public final class CdmaCallTracker extends CallTracker { 
    int pendingCallClirMode;

    Phone.State state = Phone.State.IDLE;



    private boolean mIsInEmergencyCall = false;



//    boolean needsPoll;
@@ -211,9 +210,6 @@ public final class CdmaCallTracker extends CallTracker { 
            // Always unmute when initiating a new call

            setMute(false);



            // Check data call

            disableDataCallInEmergencyCall(dialString);



            String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false");

            if(inEcm.equals("false")) {

                cm.dial(pendingMO.address, clirMode, obtainCompleteMessage());
@@ -240,9 +236,6 @@ public final class CdmaCallTracker extends CallTracker { 
    private Connection

    dialThreeWay (String dialString) {

        if (!foregroundCall.isIdle()) {

            // Check data call

            disableDataCallInEmergencyCall(dialString);



            // Attach the new connection to foregroundCall

            pendingMO = new CdmaConnection(phone.getContext(),

                                dialString, this, foregroundCall);
@@ -536,9 +529,6 @@ public final class CdmaCallTracker extends CallTracker { 
                    }

                }

                foregroundCall.setGeneric(false);



                mIsInEmergencyCall = false;



                // Dropped connections are removed from the CallTracker

                // list but kept in the Call list

                connections[i] = null;
@@ -978,26 +968,6 @@ public final class CdmaCallTracker extends CallTracker { 
        }

    }



    /**

     * Disable data call when emergency call is connected

     */

    private void disableDataCallInEmergencyCall(String dialString) {

        if (PhoneNumberUtils.isEmergencyNumber(dialString)) {

            phone.disableDataConnectivity();

            mIsInEmergencyCall = true;

        }

    }



    /**

     * Check if current call is in emergency call

     *

     * @return true if it is in emergency call

     *         false if it is not in emergency call

     */

    boolean isInEmergencyCall() {

        return mIsInEmergencyCall;

    }



    protected void log(String msg) {

        Log.d(LOG_TAG, "[CdmaCallTracker] " + msg);

    }