commit 683790ae54cd0202385027d259f78894639911e7
author Elliott Hughes <enh@google.com> Thu Jul 16 21:11:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 16 21:11:23 2015 +0000
tree e2f855e87d46f355b6b9efded9fbb2997be23161
parent a1c344b9de508dda83f60f9dea6559e7b6ea6c28
parent 9136f38aabe336545225e1a34d29cea660ee237f

Merge "init: Fix bootchart trigger for emulator"

init/bootchart.cpp

diff --git a/init/bootchart.cpp b/init/bootchart.cpp
index 95687cb..81b20fa 100644
--- a/init/bootchart.cpp
+++ b/init/bootchart.cpp
@@ -164,10 +164,11 @@
         // timeout. this is useful when using -wipe-data since the /data
         // partition is fresh.
         std::string cmdline;
+        const char* s;
         android::base::ReadFileToString("/proc/cmdline", &cmdline);
 #define KERNEL_OPTION  "androidboot.bootchart="
-        if (strstr(cmdline.c_str(), KERNEL_OPTION) != NULL) {
-            timeout = atoi(cmdline.c_str() + sizeof(KERNEL_OPTION) - 1);
+        if ((s = strstr(cmdline.c_str(), KERNEL_OPTION)) != NULL) {
+            timeout = atoi(s + sizeof(KERNEL_OPTION) - 1);
         }
     }
     if (timeout == 0)