summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorjsh <jsh@google.com>2009-10-14 16:55:14 -0700
committerjsh <jsh@google.com>2009-10-14 16:57:16 -0700
commit51d412304f41e0d553c7e401e288e9394dbca950 (patch)
tree36eaddcaa6a883ea0603bcc2dd2f5156606ecabc /telephony
parent53f33d84776a0bad668e361365a7049b16f8a929 (diff)
downloadframeworks_base-51d412304f41e0d553c7e401e288e9394dbca950.zip
frameworks_base-51d412304f41e0d553c7e401e288e9394dbca950.tar.gz
frameworks_base-51d412304f41e0d553c7e401e288e9394dbca950.tar.bz2
Make sure CF icon updates when using "all CF" MMI.
Fixes b/2074739.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
index 18e6375..bcbd127 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
@@ -595,7 +595,8 @@ public final class GsmMmiCode extends Handler implements MmiCode {
}
int isSettingUnconditionalVoice =
- ((reason == CommandsInterface.CF_REASON_UNCONDITIONAL) &&
+ (((reason == CommandsInterface.CF_REASON_UNCONDITIONAL) ||
+ (reason == CommandsInterface.CF_REASON_ALL)) &&
(((serviceClass & CommandsInterface.SERVICE_CLASS_VOICE) != 0) ||
(serviceClass == CommandsInterface.SERVICE_CLASS_NONE))) ? 1 : 0;