ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 683790ae: Merge "init: Fix bootchart trigger for emulator"

Browse source 
* commit '683790ae54cd0202385027d259f78894639911e7':
  init: Fix bootchart trigger for emulator
This commit is contained in:
Elliott Hughes 2015-07-16 21:23:30 +00:00 • committed by Android Git Automerger
commit 770b78bd23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/bootchart.cpp
View file

@ -164,10 +164,11 @@ static int bootchart_init() {
// timeout. this is useful when using -wipe-data since the /data // timeout. this is useful when using -wipe-data since the /data
// partition is fresh. // partition is fresh.
std::string cmdline; std::string cmdline;
const char* s;
android::base::ReadFileToString("/proc/cmdline", &cmdline); android::base::ReadFileToString("/proc/cmdline", &cmdline);
#define KERNEL_OPTION "androidboot.bootchart=" #define KERNEL_OPTION "androidboot.bootchart="
if (strstr(cmdline.c_str(), KERNEL_OPTION) != NULL) { if ((s = strstr(cmdline.c_str(), KERNEL_OPTION)) != NULL) {
timeout = atoi(cmdline.c_str() + sizeof(KERNEL_OPTION) - 1); timeout = atoi(s + sizeof(KERNEL_OPTION) - 1);
} }
} }
if (timeout == 0) if (timeout == 0)