Index: chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java |
index 21b6e1de59457c8bbe129ed6640040c7937a6dbb..8e0ec0a22b98ca361b1764add45c9a960b3e84e3 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java |
@@ -6,13 +6,13 @@ package org.chromium.chrome.browser.crash; |
import android.annotation.TargetApi; |
import android.content.Context; |
import android.net.ConnectivityManager; |
-import android.net.NetworkInfo; |
import android.os.Build; |
import android.os.PersistableBundle; |
import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager; |
import org.chromium.components.minidump_uploader.MinidumpUploaderDelegate; |
import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager; |
+import org.chromium.components.minidump_uploader.util.NetworkPermissionUtil; |
import java.io.File; |
@@ -68,15 +68,7 @@ public class ChromeMinidumpUploaderDelegate implements MinidumpUploaderDelegate |
@Override |
public boolean isNetworkAvailableForCrashUploads() { |
- // TODO(isherman): This code should really be shared with the Android Webview |
- // implementation, which tests whether the connection is metered, rather than |
- // testing the type of the connection. Implement this change in M59 -- for M58, it's |
- // more important to maintain consistency with the previous implementation. When |
- // changing this, note that forced uploads do *not* require unmetered connections. |
- NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo(); |
- if (networkInfo == null || !networkInfo.isConnected()) return false; |
- return networkInfo.getType() == ConnectivityManager.TYPE_WIFI |
- || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET; |
+ return NetworkPermissionUtil.isNetworkUnmetered(mConnectivityManager); |
} |
@Override |