Bug 1276185: Don't invoke |SandboxInfo::SubmitTelemetry| on Android, r?gfritzsche draft
authorThomas Zimmermann <tdz@users.sourceforge.net>
Fri, 27 May 2016 11:49:56 +0200
changeset 372059 a396549029ec4978116296df58a436c7de38da24
parent 371902 4d63dde701b47b8661ab7990f197b6b60e543839
child 522085 8f6fbde3447237c52ff7f0f958ee103cf1cd656b
push id19427
push usertdz@users.sourceforge.net
push dateFri, 27 May 2016 09:50:58 +0000
reviewersgfritzsche
bugs1276185
milestone49.0a1
Bug 1276185: Don't invoke |SandboxInfo::SubmitTelemetry| on Android, r?gfritzsche The header file "mozilla/SandboxInfo.h" isn't included on Android devices, so use its interfaces. MozReview-Commit-ID: DJRMNsqsjLZ
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4356,17 +4356,17 @@ XREMain::XRE_mainRun()
 
 #ifdef MOZ_INSTRUMENT_EVENT_LOOP
   if (PR_GetEnv("MOZ_INSTRUMENT_EVENT_LOOP")) {
     bool logToConsole = true;
     mozilla::InitEventTracing(logToConsole);
   }
 #endif /* MOZ_INSTRUMENT_EVENT_LOOP */
 
-#if defined(MOZ_SANDBOX) && defined(XP_LINUX)
+#if defined(MOZ_SANDBOX) && defined(XP_LINUX) && !defined(ANDROID)
   // If we're on Linux, we now have information about the OS capabilities
   // available to us.
   SandboxInfo::SubmitTelemetry();
 #endif
 #if (defined(XP_WIN) || defined(XP_MACOSX)) && defined(MOZ_CONTENT_SANDBOX)
   SetUpSandboxEnvironment();
 #endif