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

Unified Diff: android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java

Issue 2666603002: [Android WebView] Ensure we use free connection when uploading minidumps (Closed)
Patch Set: Check whether on unmetered network instead of wifi/ethernet. Created 3 years, 11 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
« no previous file with comments | « android_webview/apk/java/AndroidManifest.xml ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
diff --git a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java b/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
index 9c7b4a5a8815353023fb2c73a0342280a389283f..b21302d5f280d181d07acbd7bfada51a5069a867 100644
--- a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
+++ b/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
@@ -5,6 +5,8 @@
package org.chromium.android_webview.crash;
import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import org.chromium.base.Log;
import org.chromium.base.VisibleForTesting;
@@ -25,6 +27,7 @@ import java.io.File;
public class MinidumpUploaderImpl implements MinidumpUploader {
private static final String TAG = "MinidumpUploaderImpl";
private Thread mWorkerThread;
+ private final ConnectivityManager mConnectivityManager;
private final CrashFileManager mFileManager;
private Object mCancelLock = new Object();
@@ -56,6 +59,8 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
@VisibleForTesting
public MinidumpUploaderImpl(Context context, boolean cleanOutMinidumps) {
+ mConnectivityManager =
+ (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
File webviewCrashDir = CrashReceiverService.createWebViewCrashDir(context);
mFileManager = new CrashFileManager(webviewCrashDir);
if (!mFileManager.ensureCrashDirExists()) {
@@ -89,7 +94,9 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
public boolean isNetworkAvailableForCrashUploads() {
// JobScheduler will call onStopJob causing our upload to be interrupted when our
// network requirements no longer hold.
- return true;
+ NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
+ if (networkInfo == null || !networkInfo.isConnected()) return false;
+ return !mConnectivityManager.isActiveNetworkMetered();
}
@Override
public boolean isCrashUploadDisabledByCommandLine() {
« no previous file with comments | « android_webview/apk/java/AndroidManifest.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698