Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: components/breakpad/app/breakpad_linux.cc

Issue 113873006: [Android] Disable tombstones for renderer crashes on JB MR2+ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/java/src/org/chromium/base/BuildInfo.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/breakpad/app/breakpad_linux.cc
diff --git a/components/breakpad/app/breakpad_linux.cc b/components/breakpad/app/breakpad_linux.cc
index cc220f14bb0ef8cf946b45cc2a13883f759e36e6..d77ca53363f75fc229ad0744a14b535d48500a58 100644
--- a/components/breakpad/app/breakpad_linux.cc
+++ b/components/breakpad/app/breakpad_linux.cc
@@ -701,7 +701,27 @@ bool CrashDoneInProcessNoUpload(
info.pid = g_pid;
info.crash_keys = g_crash_keys;
HandleCrashDump(info);
- return FinalizeCrashDoneAndroid();
+ bool finalize_result = FinalizeCrashDoneAndroid();
+ base::android::BuildInfo* android_build_info =
+ base::android::BuildInfo::GetInstance();
+ if (android_build_info->sdk_int() >= 18 &&
+ strcmp(android_build_info->build_type(), "eng") != 0 &&
Yaron 2013/12/17 01:22:52 Why not explicitly check for user builds? Are you
+ strcmp(android_build_info->build_type(), "userdebug") != 0) {
+ // On JB MR2 and later, the system crash handler displays a dialog. For
+ // renderer crashes, this is a bad user experience and so this is disabled
+ // for user builds of Android.
+ // TODO(cjhopman): There should be some way to recover the crash stack from
+ // non-uploading user clients. See http://crbug.com/273706.
+ __android_log_write(ANDROID_LOG_WARN,
+ kGoogleBreakpad,
+ "Tombstones are disabled on JB MR2+ user builds.");
+ __android_log_write(ANDROID_LOG_WARN,
+ kGoogleBreakpad,
+ "### ### ### ### ### ### ### ### ### ### ### ### ###");
+ return true;
+ } else {
+ return finalize_result;
+ }
}
void EnableNonBrowserCrashDumping(const std::string& process_type,
« no previous file with comments | « base/android/java/src/org/chromium/base/BuildInfo.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698