commit 0b76d0209981fb79350ff6b7ce25d010dddf42fa
author Ben Cheng <bccheng@google.com> Mon Sep 24 14:30:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 14:30:06 2012 -0700
tree 35d13365438f0f1fa895caf677d01a7fa91f8f17
parent f1c50bf63857b9cdabcf930363c372defc6383a8
parent c47b772b67a2da5599b712e8c98cb0879dad6e48

Merge "Dump 256 bytes per chunk pointed by general-purpose registers." into jb-mr1-dev

libsuspend/autosuspend_autosleep.c

diff --git a/libsuspend/autosuspend_autosleep.c b/libsuspend/autosuspend_autosleep.c
index dd0dfef..5451615 100644
--- a/libsuspend/autosuspend_autosleep.c
+++ b/libsuspend/autosuspend_autosleep.c
@@ -95,5 +95,8 @@
     }
 
     ALOGI("Selected autosleep\n");
+
+    autosuspend_autosleep_disable();
+
     return &autosuspend_autosleep_ops;
 }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a32cb93..d3030e4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -5,8 +5,8 @@
 #
 
 import /init.usb.rc
-import /init.trace.rc
 import /init.${ro.hardware}.rc
+import /init.trace.rc
 
 on early-init
     # Set init and its forked children's oom_adj.