Merge lp:~ycheng-twn/powerd/powerd_lp1323286 into lp:powerd

[Yuan-Chen Cheng]

Use android standard way on libsuspend detection.

use android standard way on libsuspend detection.

tested on n4, n10.

[Ricardo Salveti (rsalveti)]

Looks good, works as expected.

review: Approve

=== modified file 'libsuspend/earlysuspend.c'
--- libsuspend/earlysuspend.c	2014-08-11 12:31:24 +0000
+++ libsuspend/earlysuspend.c	2014-09-02 08:02:10 +0000
@@ -50,7 +50,6 @@
 static const char state_path[] = "/sys/power/state";
 static const char wakelock_path[] = "/sys/power/wake_lock";
 static const char wakeunlock_path[] = "/sys/power/wake_unlock";
-static const char autosleep_path[] = "/sys/power/autosleep";
 
 static const char mem_str[] = "mem";
 static const char on_str[] = "on";
@@ -157,9 +156,16 @@
 
 const struct suspend_handler *earlysuspend_detect(void)
 {
-    if (!sysfs_file_exists(autosleep_path) &&
-        sysfs_file_exists(wakelock_path) &&
+    int len, ret;
+    if (sysfs_file_exists(wakelock_path) &&
         sysfs_file_exists(state_path)) {
+
+        len = ARRAY_SIZE(on_str) - 1;
+        ret = sysfs_write(state_path, on_str, len);
+        if (ret != len) {
+            return NULL;
+        }
+
         wait_for_fb = start_fb_monitor_thread();
         return &earlysuspend_handler;
     }

=== modified file 'libsuspend/libsuspend.c'
--- libsuspend/libsuspend.c	2014-08-11 12:31:24 +0000
+++ libsuspend/libsuspend.c	2014-09-02 08:02:10 +0000
@@ -26,14 +26,14 @@
 void libsuspend_init(int force_mock)
 {
     if (!force_mock) {
+        handler = earlysuspend_detect();
+        if (handler)
+            return;
+
         handler = autosleep_detect();
         if (handler)
             return;
 
-        handler = earlysuspend_detect();
-        if (handler)
-            return;
-
         handler = legacy_detect();
         if (handler)
             return;