lp:~charlesk/indicator-datetime/hw-alarms-api

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-datetime/13.10 at revision 344

PS Jenkins bot (community): Approve (continuous-integration) on 2014-06-10

Ted Gould (community): Approve on 2014-06-10

Diff: 1364 lines (+882/-141)

20 files modified

CMakeLists.txt (+7/-0)
MERGE-REVIEW (+30/-5)
debian/control (+2/-0)
include/datetime/alarm-queue-simple.h (+63/-0)
include/datetime/alarm-queue.h (+12/-28)
include/datetime/date-time.h (+3/-0)
include/datetime/planner-range.h (+1/-1)
include/datetime/wakeup-timer-mainloop.h (+62/-0)
include/datetime/wakeup-timer-uha.h (+64/-0)
include/datetime/wakeup-timer.h (+55/-0)
src/CMakeLists.txt (+31/-24)
src/alarm-queue-simple.cpp (+116/-38)
src/date-time.cpp (+5/-0)
src/engine-eds.cpp (+10/-2)
src/main.cpp (+88/-27)
src/planner-range.cpp (+1/-1)
src/wakeup-timer-mainloop.cpp (+138/-0)
src/wakeup-timer-uha.cpp (+175/-0)
tests/CMakeLists.txt (+1/-1)
tests/test-alarm-queue.cpp (+18/-14)

api

Superseded for merging into lp:indicator-datetime/14.04

Indicator Applet Developers: Pending requested 2014-04-25

Diff: 1315 lines (+845/-119)

20 files modified

CMakeLists.txt (+1/-0)
MERGE-REVIEW (+30/-5)
debian/control (+3/-0)
include/datetime/alarm-queue-simple.h (+63/-0)
include/datetime/alarm-queue.h (+12/-28)
include/datetime/date-time.h (+3/-0)
include/datetime/planner-range.h (+1/-1)
include/datetime/wakeup-timer-mainloop.h (+62/-0)
include/datetime/wakeup-timer-uha.h (+64/-0)
include/datetime/wakeup-timer.h (+55/-0)
src/CMakeLists.txt (+4/-2)
src/alarm-queue-simple.cpp (+116/-38)
src/date-time.cpp (+5/-0)
src/engine-eds.cpp (+10/-2)
src/main.cpp (+83/-27)
src/planner-range.cpp (+1/-1)
src/wakeup-timer-mainloop.cpp (+138/-0)
src/wakeup-timer-uha.cpp (+175/-0)
tests/CMakeLists.txt (+1/-1)
tests/test-alarm-queue.cpp (+18/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1299916: Alarm Clock does not ring when phone is locked

Undecided

Fix Released

Link a bug report

Related blueprints

355. By Charles Kerr on 2014-06-11

remove a pair of #warning tracers

354. By Charles Kerr on 2014-06-11

Don't build the hw-alarms pieces if ubuntu/hardware/alarm.h can't be found. Don't require libplatform-hardware-api-* unless the arch is armhf, i386, or amd64.

353. By Charles Kerr on 2014-06-10

in debian/control, remove 'Depends: libubuntu-platform-hardware-api1' as per ted's suggestion

352. By Charles Kerr on 2014-06-10

in MERGE-REVIEW, outline the steps needed to run hw alarm wakeup tests

351. By Charles Kerr on 2014-06-10

remove some debug tracers that shouldn't've been committed

350. By Charles Kerr on 2014-06-10

in SimpleAlarmQueue, the 'alarms we don't want to trigger' list needs to be composed of uid + timestamp. Keying off of only timestamp doesn't work because UIDs can be recycled as users edit and reuse alarms.

349. By Charles Kerr on 2014-06-10

in UhaWakeupTimer, ensure the timeout signal gets emitted from inside a glib idle callback.

348. By Charles Kerr on 2014-06-10

in wakeup-timer-uha, sync with platform-api changes and add a safeguard to ensure the service doesn't try to sleep for an event that's already passed.

347. By Charles Kerr on 2014-06-10

in wakeup-timer-uha, set idle wakeup to 1 day from now rather than 1 year from now.

346. By Charles Kerr on 2014-06-10

in engine-eds, add debug messages