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

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

Merge change 23818 into eclair 

* changes:
  Exit Emergency Callback Mode if phone process crashes/restarts
parents 505cbb44 9b62851c

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -179,6 +179,10 @@ public class CDMAPhone extends PhoneBase { 
        // This is needed to handle phone process crashes

        // This is needed to handle phone process crashes

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

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

        mIsPhoneInEcmState = inEcm.equals("true");

        mIsPhoneInEcmState = inEcm.equals("true");

        if (mIsPhoneInEcmState) {

            // Send a message which will invoke handleExitEmergencyCallbackMode

            mCM.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));

        }





        // get the string that specifies the carrier OTA Sp number

        // get the string that specifies the carrier OTA Sp number

        mCarrierOtaSpNumSchema = SystemProperties.get(

        mCarrierOtaSpNumSchema = SystemProperties.get(
@@ -1011,7 +1015,6 @@ public class CDMAPhone extends PhoneBase { 
                    Log.d(LOG_TAG, "ERI read, notify registrants");

                    Log.d(LOG_TAG, "ERI read, notify registrants");

                    mEriFileLoadedRegistrants.notifyRegistrants();

                    mEriFileLoadedRegistrants.notifyRegistrants();

                }

                }

                setSystemProperty(TelephonyProperties.PROPERTY_INECM_MODE,"false");

            }

            }

            break;

            break;