lp://staging/~boiko/telephony-service/sync_ota5_fixes
- Get this branch:
- bzr branch lp://staging/~boiko/telephony-service/sync_ota5_fixes
Branch merges
- Tiago Salem Herrmann (community): Approve
- PS Jenkins bot: Needs Fixing (continuous-integration)
-
Diff: 1020 lines (+487/-43)30 files modified.bzrignore (+1/-0)
CMakeLists.txt (+8/-0)
approver/approver.cpp (+20/-3)
approver/approver.h (+1/-0)
cmake/modules/GenerateTest.cmake (+8/-3)
debian/telephony-service.install (+3/-3)
handler/callhandler.cpp (+2/-3)
handler/handler.cpp (+30/-3)
handler/handler.h (+1/-0)
indicator/icons/CMakeLists.txt (+2/-1)
indicator/messagingmenu.cpp (+0/-1)
indicator/ussdindicator.cpp (+13/-6)
libtelephonyservice/applicationutils.cpp (+9/-7)
libtelephonyservice/callentry.cpp (+1/-1)
libtelephonyservice/telepathyhelper.cpp (+1/-0)
po/CMakeLists.txt (+1/-1)
tests/CMakeLists.txt (+1/-0)
tests/approver/ApproverTest.cpp (+108/-0)
tests/approver/CMakeLists.txt (+16/-0)
tests/approver/approvercontroller.cpp (+49/-0)
tests/approver/approvercontroller.h (+41/-0)
tests/common/CMakeLists.txt (+3/-0)
tests/common/NotificationsMock.cpp (+86/-0)
tests/common/mock/callchannel.cpp (+11/-1)
tests/handler/HandlerTest.cpp (+50/-7)
tests/handler/approver.cpp (+7/-1)
tests/handler/approver.h (+1/-1)
tests/handler/handlercontroller.cpp (+6/-0)
tests/handler/handlercontroller.h (+1/-0)
tests/libtelephonyservice/CallEntryTest.cpp (+6/-1)
Related bugs
Related blueprints
Branch information
Recent revisions
- 1098. By Gustavo Pichorim Boiko
-
Sync the fixes that were released in OTA5:
[ Andreas Pokorny ]
* sbuild fix[ Gustavo Pichorim Boiko ]
* Do not update the pot file automatically on builds, it causes
conflicts when multiple changes are applied together.[ Iain Lane ]
* We don't inherit from the 'gnome' icon theme any more, so our icons
weren't being found in a default Unity session using ubuntu-mono-
dark. We do, however, inherit from Humanity, so put the icons under
this theme. (LP: #1412709)[ Sebastien Bacher ]
* Don't play keypad sounds in silentmode (LP: #1384274)
* don't unref a non owned variant, g_variant_new_strv( ) returns a
floating reference which is consumed by calling
messaging_menu_message_ add_action( ) thanks Lars Uebernickel for
pointing the issue (LP: #1427286)[ Tiago Salem Herrmann ]
* Check if targetContact() returns a valid pointer before using it.
(LP: #1433068)[ Gustavo Pichorim Boiko ]
* Prevent telephony-service from auto-accepting calls in the case of
an approver failure. added: tests/approver/
tests/approver/ ApproverTest. cpp tests/approver/ CMakeLists. txt
tests/approver/ approvercontrol ler.cpp
tests/approver/ approvercontrol ler.h [ Tiago Salem Herrmann ]
* Do not let USSD and incoming call snap decisions timeout. Initialize
m_notificationId with -1, as 0 is a valid id. Do not call
CloseNotification( ) when notificationClo sed() is received to avoid
loop. (LP: #1453004)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/telephony-service