Merge lp:~rsalveti/powerd/drop_support_sf into lp:powerd

[Ricardo Salveti]

Drop support for surface flinger (MIR is now the default)

Drop support for surface flinger (MIR is now the default)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/powerd-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/powerd-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~rsalveti/powerd/drop_support_sf]

124. By Ricardo Salveti on 2014-03-31

Bumping major version, dropping compatibility with Surface Flinger

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yes.

review: Approve

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-28 15:30:54 +0000
+++ debian/changelog	2014-03-31 15:36:44 +0000
@@ -1,3 +1,9 @@
+powerd (0.14-0ubuntu1) trusty; urgency=medium
+
+  * Bumping major version, dropping compatibility with Surface Flinger
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Mon, 31 Mar 2014 12:34:00 -0300
+
 powerd (0.13+14.04.20140328.1-0ubuntu1) trusty; urgency=low
 
   [ Alfonso Sanchez-Beato ]

=== modified file 'src/display.c'
--- src/display.c	2014-03-20 11:28:05 +0000
+++ src/display.c	2014-03-31 15:36:44 +0000
@@ -32,8 +32,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <hybris/surface_flinger/surface_flinger_compatibility_layer.h>
-
 #include "powerd.h"
 #include "powerd-internal.h"
 #include "log.h"
@@ -48,9 +46,6 @@
 };
 static enum bl_state target_bl_state = BL_BRIGHT;
 
-/* Mir usage hint file path */
-#define MIR_HINT_PATH	"/home/phablet/.display-mir"
-
 /* Treat "don't care" display state as off */
 #define DISPLAY_STATE_OFF POWERD_DISPLAY_STATE_DONT_CARE
 
@@ -61,7 +56,6 @@
 
 static int user_brightness;
 static gboolean user_ab_enabled;
-static gboolean running_mir = FALSE;
 
 /* Assume screen is off to start; we will force it on */
 static uuid_t internal_request_cookie;
@@ -160,48 +154,41 @@
 
     powerd_debug("display_set_power_mode(%s)", power_mode);
 
-    if (!running_mir) {
-        if (strcmp(power_mode, "off") == 0)
-            sf_blank(display);
-        else
-            sf_unblank(display);
-    } else {
-        if (strcmp(power_mode, "on") == 0)
-            powerd_hal_signal_activity();
-
-        unity_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-                    G_DBUS_PROXY_FLAGS_NONE,
-                    NULL,
-                    "com.canonical.Unity.Screen",
-                    "/com/canonical/Unity/Screen",
-                    "com.canonical.Unity.Screen",
-                    NULL,
-                    &error);
-
-        if (error != NULL) {
-            powerd_warn("could not connect to Unity: %s", error->message);
-            g_error_free(error);
-            return FALSE;
-        }
-
-        GVariant *ret = g_dbus_proxy_call_sync(unity_proxy,
-                "setScreenPowerMode",
-                g_variant_new("(s)", power_mode),
-                G_DBUS_CALL_FLAGS_NONE,
-                -1,
+    if (strcmp(power_mode, "on") == 0)
+        powerd_hal_signal_activity();
+
+    unity_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
+                G_DBUS_PROXY_FLAGS_NONE,
+                NULL,
+                "com.canonical.Unity.Screen",
+                "/com/canonical/Unity/Screen",
+                "com.canonical.Unity.Screen",
                 NULL,
                 &error);
 
-        if (ret == NULL) {
-            powerd_warn("screen power setting failed: %s", error->message);
-            g_error_free(error);
-            g_object_unref(unity_proxy);
-            return FALSE;
-        }
-
+    if (error != NULL) {
+        powerd_warn("could not connect to Unity: %s", error->message);
+        g_error_free(error);
+        return FALSE;
+    }
+
+    GVariant *ret = g_dbus_proxy_call_sync(unity_proxy,
+            "setScreenPowerMode",
+            g_variant_new("(s)", power_mode),
+            G_DBUS_CALL_FLAGS_NONE,
+            -1,
+            NULL,
+            &error);
+
+    if (ret == NULL) {
+        powerd_warn("screen power setting failed: %s", error->message);
+        g_error_free(error);
         g_object_unref(unity_proxy);
+        return FALSE;
     }
 
+    g_object_unref(unity_proxy);
+
     return TRUE;
 }
 
@@ -424,10 +411,6 @@
     /* Use the current brightness until we're told another value */
     user_brightness = powerd_get_brightness();
 
-    /* decide whether we are running on Mir or SF */
-    if (stat(MIR_HINT_PATH, &stats) == 0)
-        running_mir = TRUE;
-
     return 0;
 }