Merge changes from topic 'debuggerd_snprintf' am: fefda6b508 am: 8de67e537f

am: e5b6b89908

Change-Id: I4d9ec396dabfeab1a7b343c784a1c068cd036c96
This commit is contained in:
Josh Gao 2017-02-16 03:56:44 +00:00 committed by android-build-merger
commit 1eb2cb190f

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;