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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java

Issue 2307713002: [Android] Provide an API for manually triggering a crash report upload. (Closed)
Patch Set: Use a separate suffix for forced uploads Created 4 years, 3 months 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
Index: chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
index 15fb25a7097bce3f1a93b2b3593f5eb94a707a90..15f09d20562449d06ca417b1f7911edb64773a88 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java
@@ -97,18 +97,20 @@ public class MinidumpUploadCallable implements Callable<Integer> {
if (mPermManager.isUploadEnabledForTests()) {
Log.i(TAG, "Minidump upload enabled for tests, skipping other checks.");
} else {
- if (!mPermManager.isUploadUserPermitted()) {
- Log.i(TAG, "Minidump upload is not permitted by user. Marking file as skipped for "
- + "cleanup to prevent future uploads.");
- CrashFileManager.markUploadSkipped(mFileToUpload);
- return UPLOAD_USER_DISABLED;
- }
-
- if (!mPermManager.isClientInMetricsSample()) {
- Log.i(TAG, "Minidump upload skipped due to sampling. Marking file as skipped for "
- + "cleanup to prevent future uploads.");
- CrashFileManager.markUploadSkipped(mFileToUpload);
- return UPLOAD_DISABLED_BY_SAMPLING;
+ if (!CrashFileManager.isForcedUpload(mFileToUpload)) {
+ if (!mPermManager.isUploadUserPermitted()) {
+ Log.i(TAG, "Minidump upload is not permitted by user. Marking file as skipped "
+ + "for cleanup to prevent future uploads.");
+ CrashFileManager.markUploadSkipped(mFileToUpload);
+ return UPLOAD_USER_DISABLED;
+ }
+
+ if (!mPermManager.isClientInMetricsSample()) {
+ Log.i(TAG, "Minidump upload skipped due to sampling. Marking file as skipped "
+ + "for cleanup to prevent future uploads.");
+ CrashFileManager.markUploadSkipped(mFileToUpload);
+ return UPLOAD_DISABLED_BY_SAMPLING;
+ }
}
boolean isLimited = mPermManager.isUploadLimited();

Powered by Google App Engine
This is Rietveld 408576698