commit a7486cfacba471349565d3be901d21002cd1bfc4
author Josh Gao <jmgao@google.com> Thu Feb 16 03:50:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 03:50:22 2017 +0000
tree 7828745cab7626225e92ef84fe4761d37bffed40
parent 44a28eabdf3e6a14c30ee7165d35b71a9b0f8c5d
parent f56d05792de2e8259c3fbfc5326df7c8cd9dabe7

Merge changes from topic 'debuggerd_snprintf'
am: fefda6b508

Change-Id: I8ea82692779d531c453b50ffd45309317e9a4f0f

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;