summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2010-01-21 17:44:09 -0800
committerJohn Wang <johnwang@google.com>2010-01-22 01:03:14 -0800
commit08cb0024026e0f42612ab569e1e4067d5ede3bf8 (patch)
tree27eb814e76f930a3729babb12de149c7fbe83a78
parent9a400fa4d3e89a3ab3669c0aa2ef6676020646d1 (diff)
downloadbase-08cb0024026e0f42612ab569e1e4067d5ede3bf8.tar.gz
Handle emergency calls only status in ServiceStateTracker.
For bug 2352094, handle emergency calls only status and pass the emergency calls only string via SPN_STRING_UPDATED intent.
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java36
1 files changed, 35 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 3bf76d4623d6..5034e1611ce1 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -96,6 +96,12 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
*/
private boolean mDataRoaming = false;
+ /**
+ * Mark when service state is in emergency call only mode
+ */
+ private boolean mEmergencyOnly = false;
+ private boolean mNewEmergencyOnly = false;
+
private RegistrantList gprsAttachedRegistrants = new RegistrantList();
private RegistrantList gprsDetachedRegistrants = new RegistrantList();
private RegistrantList psRestrictEnabledRegistrants = new RegistrantList();
@@ -550,6 +556,11 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
String spn = phone.mSIMRecords.getServiceProviderName();
String plmn = ss.getOperatorAlphaLong();
+ // For emergency calls only, pass the EmergencyCallsOnly string via EXTRA_PLMN
+ if (mEmergencyOnly && cm.getRadioState().isOn()) {
+ plmn = phone.getContext().getText(com.android.internal.R.string.emergency_calls_only).toString();
+ }
+
if (rule != curSpnRule
|| !TextUtils.equals(spn, curSpn)
|| !TextUtils.equals(plmn, curPlmn)) {
@@ -557,6 +568,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
(rule & SIMRecords.SPN_RULE_SHOW_SPN) == SIMRecords.SPN_RULE_SHOW_SPN;
boolean showPlmn =
(rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN;
+
+ if (mEmergencyOnly)
+ showPlmn = true;
+
Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION);
intent.putExtra(Intents.EXTRA_SHOW_SPN, showSpn);
intent.putExtra(Intents.EXTRA_SPN, spn);
@@ -564,6 +579,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
intent.putExtra(Intents.EXTRA_PLMN, plmn);
phone.getContext().sendStickyBroadcast(intent);
}
+
curSpnRule = rule;
curSpn = spn;
curPlmn = plmn;
@@ -629,6 +645,13 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
mGsmRoaming = regCodeIsRoaming(regState);
newSS.setState (regCodeToServiceState(regState));
+
+ if (regState == 10 || regState == 12 || regState == 13 || regState == 14) {
+ mNewEmergencyOnly = true;
+ } else {
+ mNewEmergencyOnly = false;
+ }
+
// LAC and CID are -1 if not avail
newCellLoc.setLacAndCid(lac, cid);
break;
@@ -838,6 +861,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
boolean hasLocationChanged = !newCellLoc.equals(cellLoc);
+ boolean hasEmergencyOnlyChanged = mNewEmergencyOnly != mEmergencyOnly;
+
ServiceState tss;
tss = ss;
ss = newSS;
@@ -849,6 +874,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
cellLoc = newCellLoc;
newCellLoc = tcl;
+ mEmergencyOnly = mNewEmergencyOnly;
+
// Add an event log when network type switched
// TODO: we may add filtering to reduce the event logged,
@@ -948,10 +975,13 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISROAMING,
ss.getRoaming() ? "true" : "false");
- updateSpnDisplay();
phone.notifyServiceStateChanged(ss);
}
+ if (hasChanged || hasEmergencyOnlyChanged) {
+ updateSpnDisplay();
+ }
+
if (hasGprsAttached) {
gprsAttachedRegistrants.notifyRegistrants();
}
@@ -1198,6 +1228,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
case 2: // 2 is "searching"
case 3: // 3 is "registration denied"
case 4: // 4 is "unknown" no vaild in current baseband
+ case 10:// same as 0, but indicates that emergency call is possible.
+ case 12:// same as 2, but indicates that emergency call is possible.
+ case 13:// same as 3, but indicates that emergency call is possible.
+ case 14:// same as 4, but indicates that emergency call is possible.
return ServiceState.STATE_OUT_OF_SERVICE;
case 1: