Merge change I51d41230 into eclair

* changes: Make sure CF icon updates when using "all CF" MMI.
2009-10-15 18:49:44 -04:00
parent 173a25f670 51d412304f
commit 2a39758ecb
1 changed files with 2 additions and 1 deletions
--- 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;