Merge lp://staging/~tiagosh/telephony-service/fix-1398427 into lp://staging/telephony-service

Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 996
Merged at revision: 994
Proposed branch: lp://staging/~tiagosh/telephony-service/fix-1398427
Merge into: lp://staging/telephony-service
Diff against target: 299 lines (+106/-8)
10 files modified
approver/Approver.xml (+7/-0)
approver/approver.cpp (+53/-2)
approver/approver.h (+4/-0)
approver/approverdbus.cpp (+6/-1)
approver/approverdbus.h (+5/-1)
approver/main.cpp (+4/-4)
libtelephonyservice/callmanager.cpp (+11/-0)
libtelephonyservice/callmanager.h (+1/-0)
libtelephonyservice/telepathyhelper.cpp (+13/-0)
libtelephonyservice/telepathyhelper.h (+2/-0)
To merge this branch: bzr merge lp://staging/~tiagosh/telephony-service/fix-1398427
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+246224@code.staging.launchpad.net

Commit message

Expose HandleMediaKey(bool doubleClick) to DBus.

Description of the change

Expose HandleMediaKey(bool doubleClick) to DBus.
This is going to be called by unity8.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telephony-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Hey, do you think it'd make sense for you to return true/false depending on whether you accepted (consumed/reacted to) the event? We could fall back to other consumers then.

review: Needs Information
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
992. By Tiago Salem Herrmann

Return a bool value in HandleMediaKey to indicate if the event will be handled by the approver.

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

> Hey, do you think it'd make sense for you to return true/false depending on
> whether you accepted (consumed/reacted to) the event? We could fall back to
> other consumers then.

Yes, good idea. Just changed the code to match your suggestion.

993. By Tiago Salem Herrmann

export handleMediaKey(bool) to qml plugin

994. By Tiago Salem Herrmann

cache hasCalls value

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
995. By Tiago Salem Herrmann

change return name

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
996. By Tiago Salem Herrmann

- change approver bus name to fix dbus activation
- use a global timer and always return right away on HandleMediaKey()

Revision history for this message
Michał Sawicz (saviq) wrote :

Great, thanks!

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

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but that's because the tests are being run twice, and in the second run it failed.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Hmm... this seems to crash unity8 when I call:

callManager.handleMediaKey(false)

997. By Tiago Salem Herrmann

use mApproverInterface instead of mHandlerInterface

Revision history for this message
Michael Zanetti (mzanetti) wrote :

Tried the current build from silo 19 (should be rev 997) but it still crashes with this backtrace:

http://paste.ubuntu.com/9755185/

review: Needs Fixing
998. By Tiago Salem Herrmann

initialize variable

Revision history for this message
Michael Zanetti (mzanetti) wrote :

this works for me now

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches