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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java

Issue 1451153002: Schedule retry for user-permitted uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo introduction of obsolete code Created 5 years, 1 month 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/preferences/privacy/PrivacyPreferencesManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
index b1af0eaa1b736e4ff493cf2e9179f6177c1d178e..48de32563b9739e951ac47cbbe52354756b99bdd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java
@@ -246,6 +246,26 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage
}
/**
+ * Check whether the user allows uploading.
+ * This doesn't take network condition into consideration.
+ * A crash dump may be retried if this check passes.
+ *
+ * @return whether user's preference allows uploading crash dump.
+ */
+ @Override
+ public boolean isUploadUserPermitted() {
+ if (!mCrashUploadingEnabled) return false;
+ if (isCellularExperimentEnabled()) return isUsageAndCrashReportingEnabled();
+
+ if (isMobileNetworkCapable()) {
+ String option =
+ mSharedPreferences.getString(PREF_CRASH_DUMP_UPLOAD, mCrashDumpNeverUpload);
+ return option.equals(mCrashDumpAlwaysUpload) || option.equals(mCrashDumpWifiOnlyUpload);
+ }
+ return mSharedPreferences.getBoolean(PREF_CRASH_DUMP_UPLOAD_NO_CELLULAR, false);
+ }
+
+ /**
* Check whether uploading crash dump should be in constrained mode based on user experiments
* and current connection type. This function shows whether in general uploads should be limited
* for this user and does not determine whether crash uploads are currently possible or not. Use

Powered by Google App Engine
This is Rietveld 408576698