Merge lp:~mterry/powerd/ussd-turn-on-screen-for-notification into lp:powerd

[Michael Terry]

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for a UUSD message. This means the screen will only be on 15s instead of 60s.

This is a follow-on from using the NOTIFICATION reason for SMS messages [1]. But USSD messages should also be treated as notifications, right?

(I've left the CallAdded notification alone, since incoming rings last longer than 15s and it's a higher priority notification.)

[1] https://code.launchpad.net/~afrantzis/powerd/sms-turn-on-screen-for-notification/+merge/265271

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for a UUSD message. This means the screen will only be on 15s instead of 60s.

This is a follow-on from using the NOTIFICATION reason for SMS messages [1]. But USSD messages should also be treated as notifications, right?

(I've left the CallAdded notification alone, since incoming rings last longer than 15s and it's a higher priority notification.)

[1] https://code.launchpad.net/~afrantzis/powerd/sms-turn-on-screen-for-notification/+merge/265271

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/powerd-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/powerd-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/184/rebuild

review: Approve (continuous-integration)

Unmerged revisions

177. By Michael Terry on 2015-08-06

Use NOTIFICATION reason when waking the screen for a USSD message

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2015-07-20 14:53:30 +0000
+++ src/powerd.cpp	2015-08-06 14:13:35 +0000
@@ -300,7 +300,7 @@
          (!strcmp(signal_name, "RequestReceived"))) && 
         (call_added == 0)) {
             powerd_debug("Waking up the device - Incoming USSD");
-            turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
+            turn_display_on(TRUE, UNITY_SCREEN_REASON_NOTIFICATION);
     }
 }