telephony-service

Merge lp:~seb128/telephony-service/dialpad-nosound-silentmode into lp:telephony-service

  1. dialpad-nosound-silentmode
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Superseded
Proposed branch: lp:~seb128/telephony-service/dialpad-nosound-silentmode
Merge into: lp:telephony-service
Diff against target: 13 lines (+2/-1)
1 file modified
handler/callhandler.cpp (+2/-1)
To merge this branch: bzr merge lp:~seb128/telephony-service/dialpad-nosound-silentmode
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+260731@code.launchpad.net

This proposal has been superseded by a proposal from 2015-07-06.

Commit message

Don't play keypad sounds in silentmode

Description of the change

Don't play keypad sounds in silentmode

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/451/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/119/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/451/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/452/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/120/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/452/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/131

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/463/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good and works as expected!

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'handler/callhandler.cpp'
2--- handler/callhandler.cpp 2015-03-04 18:02:13 +0000
3+++ handler/callhandler.cpp 2015-06-01 15:23:31 +0000
4@@ -177,7 +177,8 @@
5 * play locally (via tone generator) only if we are on a call, or if this is
6 * dialpad sounds
7 */
8- if (GreeterContacts::instance()->dialpadSoundsEnabled() && objectPath.isEmpty()
9+ if (GreeterContacts::instance()->dialpadSoundsEnabled() &&
10+ !GreeterContacts::instance()->silentMode() && objectPath.isEmpty()
11 || !objectPath.isEmpty()) {
12 ToneGenerator::instance()->playDTMFTone((uint)event);
13 }

Subscribers

People subscribed via source and target branches