Merge "Update emergency mode for CDMA" (8ac8303f) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1650,9 +1650,9 @@ public class ServiceStateTracker extends Handler {
		mPollingContext[0]--;

		if (mPollingContext[0] == 0) {
		mNewSS.setEmergencyOnly(mEmergencyOnly);
		if (mPhone.isPhoneTypeGsm()) {
		updateRoamingState();
		mNewSS.setEmergencyOnly(mEmergencyOnly);
		} else {
		boolean namMatch = false;
		if (!isSidsAllZeros() && isHomeSid(mNewSS.getCdmaSystemId())) {
		@@ -1794,6 +1794,7 @@ public class ServiceStateTracker extends Handler {

		//Denial reason if registrationState = 3
		int reasonForDenial = networkRegState.getReasonForDenial();
		mEmergencyOnly = networkRegState.isEmergencyEnabled();
		if (mPhone.isPhoneTypeGsm()) {

		mGsmRoaming = regCodeIsRoaming(registrationState);
		@@ -1801,7 +1802,6 @@ public class ServiceStateTracker extends Handler {

		boolean isVoiceCapable = mPhone.getContext().getResources()
		.getBoolean(com.android.internal.R.bool.config_voice_capable);
		mEmergencyOnly = networkRegState.isEmergencyEnabled();
		} else {
		int roamingIndicator = voiceSpecificStates.roamingIndicator;