Merge lp:~albaguirre/powerd/avoid-suspend-during-call into lp:powerd

[Alberto Aguirre]

Issue internal suspend block suspend during calls

Issue internal suspend block suspend during calls (LP: #1359530)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/powerd-ci/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

I think it's fine for us to hold a suspend blocker during a voicecall, but we still need to solve the general issue when using the proximity sensor.

Think about what would happen when we get an app trying to use the same proximity sensor logic. I believe currently it'll also try to suspend the device.

review: Approve

[Ricardo Salveti (rsalveti)]

Checking in more details, suspending is actually an expected behavior, and we should instead try to identify the issues that are currently happening on krillin when suspending instead.

Thanks for the MR though, sorry for the confusion.

review: Disapprove

[Alberto Aguirre (albaguirre)]

No prob, what issues are you seeing on suspend?

Unmerged revisions

141. By Alberto Aguirre on 2014-08-26

Issue internal suspend block suspend during calls

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2014-08-19 20:22:10 +0000
+++ src/powerd.cpp	2014-08-26 18:58:45 +0000
@@ -355,11 +355,15 @@
            gpointer    user_data)
 {
     GVariant *tmp;
+    static uuid_t sys_state_cookie;
 
     if (!strcmp(signal_name, "CallAdded")) {
         struct call_data *call;
 
         turn_display_on(TRUE, UNITY_SCREEN_REASON_NORMAL);
+        request_sys_state_internal("ofono-request",
+                                   POWERD_SYS_STATE_ACTIVE,
+                                   &sys_state_cookie, NULL);
 
         call = (struct call_data *) calloc(1, sizeof(*call));
         tmp = g_variant_get_child_value(parameters, 0);
@@ -397,6 +401,8 @@
         if (g_calls == NULL)
             deactivate_proximity_sensor();
 
+        clear_sys_state_internal(sys_state_cookie);
+
         g_variant_unref(tmp);
     }
 }