powerd

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

  1. no-screen-on
  2. Merge into trunk
Proposed by Michael Terry
Status: Needs review
Proposed branch: lp:~mterry/powerd/no-screen-on
Merge into: lp:powerd
Diff against target: 145 lines (+0/-75)
3 files modified
src/powerd-internal.h (+0/-4)
src/powerd-object.c (+0/-8)
src/powerd.cpp (+0/-63)
To merge this branch: bzr merge lp:~mterry/powerd/no-screen-on
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+271705@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Reply

Unmerged revisions

179. By Michael Terry

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/powerd-internal.h'
2--- src/powerd-internal.h 2015-07-20 14:53:30 +0000
3+++ src/powerd-internal.h 2015-09-18 19:29:20 +0000
4@@ -146,10 +146,6 @@
5 gchar *signal_name, GVariant *parameters, gpointer user_data);
6 void on_ofono_voicecallmanager_signal(GDBusProxy *proxy, gchar *sender_name,
7 gchar *signal_name, GVariant *parameters, gpointer user_data);
8-void on_ofono_messagemanager_signal(GDBusProxy *proxy, gchar *sender_name,
9- gchar *signal_name, GVariant *parameters, gpointer user_data);
10-void on_ofono_ussd_signal(GDBusProxy *proxy, gchar *sender_name,
11- gchar *signal_name, GVariant *parameters, gpointer user_data);
12 void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
13 gchar *signal_name, GVariant *parameters, gpointer user_data);
14
15
16=== modified file 'src/powerd-object.c'
17--- src/powerd-object.c 2015-05-26 18:10:56 +0000
18+++ src/powerd-object.c 2015-09-18 19:29:20 +0000
19@@ -380,14 +380,6 @@
20 g_signal_connect(ofono_proxy, "g-signal",
21 G_CALLBACK (on_ofono_voicecallmanager_signal), NULL);
22 }
23- else if (!strcmp(interface_name, "org.ofono.MessageManager")) {
24- g_signal_connect(ofono_proxy, "g-signal",
25- G_CALLBACK (on_ofono_messagemanager_signal), NULL);
26- }
27- else if (!strcmp(interface_name, "org.ofono.SupplementaryServices")) {
28- g_signal_connect(ofono_proxy, "g-signal",
29- G_CALLBACK (on_ofono_ussd_signal), NULL);
30- }
31 powerd_debug("ofono_proxy_connect_cb succeeded");
32
33 *proxy = ofono_proxy;
34
35=== modified file 'src/powerd.cpp'
36--- src/powerd.cpp 2015-08-28 14:48:28 +0000
37+++ src/powerd.cpp 2015-09-18 19:29:20 +0000
38@@ -65,9 +65,7 @@
39 /* Used to track modem interfaces */
40 struct modem_data {
41 char *obj_name;
42- GDBusProxy *message_proxy;
43 GDBusProxy *voice_proxy;
44- GDBusProxy *ussd_proxy;
45 GDBusProxy *radiosettings_proxy;
46 };
47
48@@ -75,12 +73,8 @@
49 {
50 struct modem_data *modem = (struct modem_data *) data;
51 g_free(modem->obj_name);
52- if (modem->message_proxy)
53- g_object_unref(modem->message_proxy);
54 if (modem->voice_proxy)
55 g_object_unref(modem->voice_proxy);
56- if (modem->ussd_proxy)
57- g_object_unref(modem->ussd_proxy);
58 if (modem->radiosettings_proxy)
59 g_object_unref(modem->radiosettings_proxy);
60 }
61@@ -128,17 +122,6 @@
62
63 static void watch_modem(struct modem_data *modem)
64 {
65- /* for incoming SMS signals */
66- g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
67- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
68- NULL,
69- "org.ofono",
70- modem->obj_name,
71- "org.ofono.MessageManager",
72- NULL,
73- (GAsyncReadyCallback)ofono_proxy_connect_cb,
74- &modem->message_proxy);
75-
76 /* for incoming calls Added/Removed signals */
77 g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
78 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
79@@ -150,17 +133,6 @@
80 (GAsyncReadyCallback)ofono_proxy_connect_cb,
81 &modem->voice_proxy);
82
83- /* for USSD notifications/network requests */
84- g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
85- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
86- NULL,
87- "org.ofono",
88- modem->obj_name,
89- "org.ofono.SupplementaryServices",
90- NULL,
91- (GAsyncReadyCallback)ofono_proxy_connect_cb,
92- &modem->ussd_proxy);
93-
94 /* To set/unset low power mode */
95 g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
96 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
97@@ -256,8 +228,6 @@
98 gpointer user_data)
99 {
100 if (!strcmp(signal_name, "CallAdded") && call_added++ <= 0) {
101- turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
102-
103 powerd_info("incoming call");
104
105 } else if (!strcmp(signal_name, "CallRemoved")) {
106@@ -271,39 +241,6 @@
107 }
108 }
109
110-void
111-on_ofono_messagemanager_signal (GDBusProxy *proxy,
112- gchar *sender_name,
113- gchar *signal_name,
114- GVariant *parameters,
115- gpointer user_data)
116-{
117- powerd_debug("we get signal from %s: %s", sender_name, signal_name);
118- /* from org.ofono.MessageManager */
119- if (((!strcmp(signal_name, "IncomingMessage")) ||
120- (!strcmp(signal_name, "ImmediateMessage"))) &&
121- (call_added == 0)) {
122- powerd_debug("Waking up the device - Incoming SMS");
123- turn_display_on(TRUE, UNITY_SCREEN_REASON_NOTIFICATION);
124- }
125-}
126-
127-void on_ofono_ussd_signal(GDBusProxy *proxy,
128- gchar *sender_name,
129- gchar *signal_name,
130- GVariant *parameters,
131- gpointer user_data)
132-{
133- powerd_debug("we get signal from %s: %s", sender_name, signal_name);
134- /* from org.ofono.MessageManager */
135- if (((!strcmp(signal_name, "NotificationReceived")) ||
136- (!strcmp(signal_name, "RequestReceived"))) &&
137- (call_added == 0)) {
138- powerd_debug("Waking up the device - Incoming USSD");
139- turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
140- }
141-}
142-
143 void on_unity_signal(GDBusProxy *proxy, gchar *sender_name,
144 gchar *signal_name, GVariant *parameters, gpointer user_data)
145 {

Subscribers

People subscribed via source and target branches