Merge lp:~mterry/powerd/no-screen-on into lp:powerd

[Michael Terry]

Drop code that turns on screen upon receiving some ofono messages, because unity8 does that for us now when a notification appears.

Since unity8 8.11+15.04.20150831.2-0ubuntu1, the screen is automatically turned on when a notification is presented.

Drop code that turns on screen upon receiving some ofono messages, because unity8 does that for us now when a notification appears.

Since unity8 8.11+15.04.20150831.2-0ubuntu1, the screen is automatically turned on when a notification is presented.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

179. By Michael Terry on 2015-09-18

Don't turn on screen when notifications happen; unity8 does that itself now

=== modified file 'src/powerd-internal.h'
--- src/powerd-internal.h	2015-07-20 14:53:30 +0000
+++ src/powerd-internal.h	2015-09-18 19:29:20 +0000
@@ -146,10 +146,6 @@
     gchar *signal_name, GVariant *parameters, gpointer user_data);
 void on_ofono_voicecallmanager_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
-void on_ofono_messagemanager_signal(GDBusProxy *proxy, gchar *sender_name,
-    gchar *signal_name, GVariant *parameters, gpointer user_data);
-void on_ofono_ussd_signal(GDBusProxy *proxy, gchar *sender_name,
-    gchar *signal_name, GVariant *parameters, gpointer user_data);
 void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data);
 

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2015-05-26 18:10:56 +0000
+++ src/powerd-object.c	2015-09-18 19:29:20 +0000
@@ -380,14 +380,6 @@
             g_signal_connect(ofono_proxy, "g-signal",
                 G_CALLBACK (on_ofono_voicecallmanager_signal), NULL);
         }
-        else if (!strcmp(interface_name, "org.ofono.MessageManager")) {
-            g_signal_connect(ofono_proxy, "g-signal",
-                G_CALLBACK (on_ofono_messagemanager_signal), NULL);
-        }
-        else if (!strcmp(interface_name, "org.ofono.SupplementaryServices")) {
-            g_signal_connect(ofono_proxy, "g-signal",
-                G_CALLBACK (on_ofono_ussd_signal), NULL);
-        }
         powerd_debug("ofono_proxy_connect_cb succeeded");
 
         *proxy = ofono_proxy;

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2015-08-28 14:48:28 +0000
+++ src/powerd.cpp	2015-09-18 19:29:20 +0000
@@ -65,9 +65,7 @@
 /* Used to track modem interfaces */
 struct modem_data {
     char *obj_name;
-    GDBusProxy *message_proxy;
     GDBusProxy *voice_proxy;
-    GDBusProxy *ussd_proxy;
     GDBusProxy *radiosettings_proxy;
 };
 
@@ -75,12 +73,8 @@
 {
     struct modem_data *modem = (struct modem_data *) data;
     g_free(modem->obj_name);
-    if (modem->message_proxy)
-        g_object_unref(modem->message_proxy);
     if (modem->voice_proxy)
         g_object_unref(modem->voice_proxy);
-    if (modem->ussd_proxy)
-        g_object_unref(modem->ussd_proxy);
     if (modem->radiosettings_proxy)
         g_object_unref(modem->radiosettings_proxy);
 }
@@ -128,17 +122,6 @@
 
 static void watch_modem(struct modem_data *modem)
 {
-    /* for incoming SMS signals */
-    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        modem->obj_name,
-        "org.ofono.MessageManager",
-        NULL,
-        (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        &modem->message_proxy);
-
     /* for incoming calls Added/Removed signals */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
@@ -150,17 +133,6 @@
         (GAsyncReadyCallback)ofono_proxy_connect_cb,
         &modem->voice_proxy);
 
-    /* for USSD notifications/network requests */
-    g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-        G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-        NULL,
-        "org.ofono",
-        modem->obj_name,
-        "org.ofono.SupplementaryServices",
-        NULL,
-        (GAsyncReadyCallback)ofono_proxy_connect_cb,
-        &modem->ussd_proxy);
-
     /* To set/unset low power mode */
     g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
         G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
@@ -256,8 +228,6 @@
            gpointer    user_data)
 {
     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")) {
@@ -271,39 +241,6 @@
     }
 }
 
-void
-on_ofono_messagemanager_signal (GDBusProxy *proxy,
-           gchar      *sender_name,
-           gchar      *signal_name,
-           GVariant   *parameters,
-           gpointer    user_data)
-{
-    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"))) &&
-        (call_added == 0)) {
-            powerd_debug("Waking up the device - Incoming SMS");
-            turn_display_on(TRUE, UNITY_SCREEN_REASON_NOTIFICATION);
-    }
-}
-
-void on_ofono_ussd_signal(GDBusProxy *proxy,
-           gchar      *sender_name,
-           gchar      *signal_name,
-           GVariant   *parameters,
-           gpointer    user_data)
-{
-    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"))) && 
-        (call_added == 0)) {
-            powerd_debug("Waking up the device - Incoming USSD");
-            turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
-    }
-}
-
 void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
     gchar *signal_name, GVariant *parameters, gpointer user_data)
 {