equal
deleted
inserted
replaced
185 bool isEmergencyCall = emergencyCall(callStates); |
185 bool isEmergencyCall = emergencyCall(callStates); |
186 |
186 |
187 // No menu items if an emergency call ongoing. |
187 // No menu items if an emergency call ongoing. |
188 if (false == isEmergencyCall) { |
188 if (false == isEmergencyCall) { |
189 switch(callStates.values().count()) { |
189 switch(callStates.values().count()) { |
190 case 1: { |
190 case 1: { |
191 // No logical string for switch to video option |
|
192 /*if (callStates.values().contains(EPEStateConnected)) { |
|
193 commands.append(PhoneInCallCmdSwitchToVideo); |
|
194 }*/ |
|
195 } |
191 } |
196 break; |
192 break; |
197 case 2: { |
193 case 2: { |
198 if (!callStates.values().contains(EPEStateRinging) && |
194 if (!callStates.values().contains(EPEStateRinging) && |
199 !callStates.values().contains(EPEStateDisconnecting) && |
195 !callStates.values().contains(EPEStateDisconnecting) && |
209 } |
205 } |
210 } |
206 } |
211 } |
207 } |
212 break; |
208 break; |
213 case 3: { |
209 case 3: { |
214 commands.append(PhoneInCallCmdEndAllCalls); |
210 commands.append(PhoneInCallCmdEndAllCalls); |
|
211 |
|
212 if (callStates.values().contains(EPEStateConnected) && |
|
213 callStates.values().contains(EPEStateHeld) && |
|
214 callStates.values().contains(EPEStateRinging)) { |
|
215 if (sameServices) { |
|
216 commands.append(PhoneInCallCmdTransfer); |
|
217 } |
|
218 } |
215 } |
219 } |
216 break; |
220 break; |
217 default: |
221 default: |
218 break; |
222 break; |
219 } |
223 } |
251 case PhoneInCallCmdEndAllCalls: |
255 case PhoneInCallCmdEndAllCalls: |
252 ret = EPhoneInCallCmdEndAllCalls; |
256 ret = EPhoneInCallCmdEndAllCalls; |
253 break; |
257 break; |
254 case PhoneInCallCmdTransfer: |
258 case PhoneInCallCmdTransfer: |
255 ret = EPhoneInCallCmdTransfer; |
259 ret = EPhoneInCallCmdTransfer; |
256 break; |
260 break; |
257 case PhoneInCallCmdSwitchToVideo: |
|
258 ret = EPhoneInCallCmdSwitchToVideo; |
|
259 break; |
|
260 case PhoneInCallCmdHandoverToWlan: |
261 case PhoneInCallCmdHandoverToWlan: |
261 ret = EPhoneCmdHandoverToWlan; |
262 ret = EPhoneCmdHandoverToWlan; |
262 break; |
263 break; |
263 case PhoneInCallCmdHandoverToGsm: |
264 case PhoneInCallCmdHandoverToGsm: |
264 ret = EPhoneCmdHandoverToGsm; |
265 ret = EPhoneCmdHandoverToGsm; |