Merge changes from topic 'debuggerd_snprintf' am: fefda6b508

am: 8de67e537f

Change-Id: Ifc47ccc698724f6222f2f7b9beb984e0cfdf3c21
This commit is contained in:
Josh Gao 2017-02-16 03:53:45 +00:00 committed by android-build-merger
commit e5b6b89908

View file

@ -218,7 +218,7 @@ static void check_process(int proc_fd, pid_t expected_pid) {
}
if (proc_info.pid != expected_pid) {
LOG(FATAL) << "pid mismatch: expected " << expected_pid << ", actual " << proc_info.ppid;
LOG(FATAL) << "pid mismatch: expected " << expected_pid << ", actual " << proc_info.pid;
}
}
@ -254,7 +254,7 @@ int main(int argc, char** argv) {
}
if (!android::base::ParseInt(argv[2], &pseudothread_tid, 1, std::numeric_limits<pid_t>::max())) {
LOG(FATAL) << "invalid pseudothread tid: " << argv[1];
LOG(FATAL) << "invalid pseudothread tid: " << argv[2];
}
android::procinfo::ProcessInfo target_info;