Merge lp:~vbocek/unity-system-compositor/fix-hammerhead-backlight into lp:unity-system-compositor

[Vojtech Bocek]

This fixes backlight problems on Nexus 5. Android does things in this order, and the kernel drivers don't work correctly if the brightness is set after the panel is powered down.

This fixes backlight problems on Nexus 5. Android does things in this order, and the kernel drivers don't work correctly if the brightness is set after the panel is powered down.

[Kevin DuBois (kdub)]

change seems okay to me, working on testing a few more devices

[Alberto Aguirre (albaguirre)]

Works fine on all devices I tested.

review: Approve

[Alberto Aguirre (albaguirre)]

@Vojtech, The MP needs a commit message so we can land it.

=== modified file 'src/screen_state_handler.cpp'
--- src/screen_state_handler.cpp	2014-08-14 19:42:15 +0000
+++ src/screen_state_handler.cpp	2014-09-05 18:17:07 +0000
@@ -165,6 +165,10 @@
         //Some devices do not turn screen on properly from suspend mode
         powerd_mediator->disable_suspend();
     }
+    else
+    {
+        powerd_mediator->turn_off_backlight();
+    }
 
     display->configure(*displayConfig.get());
 
@@ -173,10 +177,6 @@
         compositor->start();
         powerd_mediator->set_normal_backlight();
     }
-    else
-    {
-        powerd_mediator->turn_off_backlight();
-    }
 
     current_power_mode = mode;