Merge lp:~mfrey/powerd/display-fix into lp:powerd

[Michael Frey]

Do not turn on display if already on a call as well as turn on display after all calls end.

Do not turn on display if already on a call as well as turn on display after all calls end.

[Bill Filler (bfiller)]

tested, works

review: Approve

[lp:~mfrey/powerd/display-fix]

146. By Michael Frey on 2014-10-24

Do not turn on display for SMS and USSD if on a call.

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-09-30 14:50:08 +0000
+++ src/powerd.cpp	2014-10-25 19:22:09 +0000
@@ -58,6 +58,8 @@
 
 static int g_exit_code = 0;
 
+static int call_added = 0;
+
 /* Used to track modem interfaces */
 struct modem_data {
     char *obj_name;
@@ -251,13 +253,19 @@
            GVariant   *parameters,
            gpointer    user_data)
 {
-    if (!strcmp(signal_name, "CallAdded")) {
+    if (!strcmp(signal_name, "CallAdded") && call_added++ <= 0) {
         turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
 
         powerd_info("incoming call");
 
     } else if (!strcmp(signal_name, "CallRemoved")) {
-        powerd_info("call removed");
+        call_added--;
+
+        //Turn the display back on when all calls are over
+        if (call_added == 0)
+            turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
+
+        powerd_info("call removed");        
     }
 }
 
@@ -270,10 +278,11 @@
 {
     powerd_debug("we get signal from %s: %s", sender_name, signal_name);
     /* from org.ofono.MessageManager */
-    if ((!strcmp(signal_name, "IncomingMessage")) ||
-        (!strcmp(signal_name, "ImmediateMessage"))) {
-        powerd_debug("Waking up the device - Incoming SMS");
-        turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
+    if (((!strcmp(signal_name, "IncomingMessage")) ||
+         (!strcmp(signal_name, "ImmediateMessage"))) &&
+        (call_added == 0)) {
+            powerd_debug("Waking up the device - Incoming SMS");
+            turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
     }
 }
 
@@ -285,10 +294,11 @@
 {
     powerd_debug("we get signal from %s: %s", sender_name, signal_name);
     /* from org.ofono.MessageManager */
-    if ((!strcmp(signal_name, "NotificationReceived")) ||
-        (!strcmp(signal_name, "RequestReceived"))) {
-        powerd_debug("Waking up the device - Incoming USSD");
-        turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
+    if (((!strcmp(signal_name, "NotificationReceived")) ||
+         (!strcmp(signal_name, "RequestReceived"))) && 
+        (call_added == 0)) {
+            powerd_debug("Waking up the device - Incoming USSD");
+            turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
     }
 }