Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2a39758e: Merge change I51d41230 into eclair

Browse Source 
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-mr2

* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
  Make sure CF icon updates when using "all CF" MMI.
This commit is contained in:
jsh
2009-10-15 15:57:28 -07:00
committed by Android Git Automerger
parent 7d4134a1a6 2a39758ecb
commit 1398295617
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
View File

@@ -595,7 +595,8 @@ public final class GsmMmiCode extends Handler implements MmiCode {
} }
int isSettingUnconditionalVoice = 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_VOICE) != 0) ||
(serviceClass == CommandsInterface.SERVICE_CLASS_NONE))) ? 1 : 0; (serviceClass == CommandsInterface.SERVICE_CLASS_NONE))) ? 1 : 0;