diff options
| author | jsh <jsh@google.com> | 2009-10-15 19:13:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-15 19:13:59 -0700 |
| commit | cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1 (patch) | |
| tree | 0f0379f50e68280e059b37205eca65e5d4645f5f /telephony | |
| parent | 49f8a0ee916c70dd5322d5f18951d50725ed3f95 (diff) | |
| parent | 1398295617457666bff877887b19ade105b83b82 (diff) | |
| download | frameworks_base-cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1.zip frameworks_base-cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1.tar.gz frameworks_base-cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1.tar.bz2 | |
am 13982956: am 2a39758e: Merge change I51d41230 into eclair
Merge commit '1398295617457666bff877887b19ade105b83b82' into eclair-mr2-plus-aosp
* commit '1398295617457666bff877887b19ade105b83b82':
Make sure CF icon updates when using "all CF" MMI.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java | 3 |
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; |