Commit 85d35b33 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Bug 1440034 - fixed reporting of annotations at the time of crashes on GeckoView; r=rbarker 

MozReview-Commit-ID: 8thtJe0QmcE

--HG--
extra : rebase_source : 68f2380d1846f4f648ac4146f2d5385ac4923522
parent aa526601

ipc/glue/GeckoChildProcessHost.cpp

+10 −2
Original line number Diff line number Diff line
@@ -1193,8 +1193,16 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type, 
  int32_t ipcFd = it->first;

  it++;

  // If the Crash Reporter is disabled, there will not be a second file descriptor.

  int32_t crashFd = (it != fds_to_remap.end()) ? it->first : -1;

  int32_t crashAnnotationFd = (it != fds_to_remap.end()) ? it->first : -1;

  int32_t crashFd = -1;

  int32_t crashAnnotationFd = -1;

  if (it != fds_to_remap.end() && !CrashReporter::IsDummy()) {

    crashFd = it->first;

    it++;

  }

  if (it != fds_to_remap.end()) {

    crashAnnotationFd = it->first;

    it++;

  }

  int32_t handle = java::GeckoProcessManager::Start(type, jargs, crashFd, ipcFd, crashAnnotationFd);



  if (process_handle) {