Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b6b899 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge changes from topic 'debuggerd_snprintf' am: fefda6b5

am: 8de67e53

Change-Id: Ifc47ccc698724f6222f2f7b9beb984e0cfdf3c21
parents 7e26f7e0 8de67e53
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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;