Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a7d7a86b: Merge change 23818 into eclair

Browse Source 
Merge commit 'a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5' into eclair-plus-aosp

* commit 'a7d7a86b328ac3d506b02ad5d5abc5d8c27b41c5':
  Exit Emergency Callback Mode if phone process crashes/restarts
This commit is contained in:
Libin Tang
2009-09-03 09:37:33 -07:00
committed by Android Git Automerger
parent 8d4713e564 a7d7a86b32
commit b3f12a98c6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -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;