commit 52a0f4ec10fa8cda3a6deb7a1e403efffa4554a8
author Josh Gao <jmgao@google.com> Thu Feb 16 03:56:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 03:56:44 2017 +0000
tree 0052c828a95650135cf8a0b0e473bf0f8b2ff7c6
parent 13d264890ded1c08ae53ba4341088bd34c482866
parent 975b174649159fcd4f455f86a29b775b27d666c8

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

Change-Id: I4d9ec396dabfeab1a7b343c784a1c068cd036c96

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 0ca90c3..d4be25b 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -218,7 +218,7 @@
   }
 
   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 @@
   }
 
   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;