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 6958ae1804cc9dafb5b3b6098074784938656d87..efcce599876b0cf73fa581abdac8a163ad563ca4 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,12 +6,12 @@ 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.CrashReportingNetworkPermissionManager; |
import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager; |
import java.io.File; |
@@ -70,15 +70,8 @@ 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(); |
gsennton
2017/03/20 17:29:01
Huh, strange that this wasn't using PrivacyPrefere
Ilya Sherman
2017/03/20 23:11:21
Yeah, a confused ilya thought that it made more se
|
- if (networkInfo == null || !networkInfo.isConnected()) return false; |
- return networkInfo.getType() == ConnectivityManager.TYPE_WIFI |
- || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET; |
+ return CrashReportingNetworkPermissionManager.isNetworkUnmetered( |
+ mConnectivityManager); |
} |
@Override |