Chromium Code Reviews| Index: android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java |
| diff --git a/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java |
| index e473ef78c23adacc1336eda01b9020374b17aebe..ec9fe8a5c15562ae49590478582174f1090d2492 100644 |
| --- a/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java |
| +++ b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java |
| @@ -6,7 +6,6 @@ package org.chromium.android_webview.crash; |
| import android.content.Context; |
| import android.net.ConnectivityManager; |
| -import android.net.NetworkInfo; |
| import android.webkit.ValueCallback; |
| import org.chromium.android_webview.PlatformServiceBridge; |
| @@ -15,6 +14,7 @@ import org.chromium.base.CommandLine; |
| import org.chromium.base.ThreadUtils; |
| import org.chromium.base.VisibleForTesting; |
| 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; |
| @@ -54,14 +54,11 @@ public class AwMinidumpUploaderDelegate implements MinidumpUploaderDelegate { |
| } |
| @Override |
| public boolean isNetworkAvailableForCrashUploads() { |
| - // JobScheduler will call onStopJob causing our upload to be interrupted when our |
| - // network requirements no longer hold. |
| - // TODO(isherman): This code should really be shared with Chrome. Chrome currently |
| - // checks only whether the network is WiFi (or ethernet) vs. cellular. Most likely, |
| - // Chrome should instead check whether the network is metered, as is done here. |
| - NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo(); |
| - if (networkInfo == null || !networkInfo.isConnected()) return false; |
| - return !mConnectivityManager.isActiveNetworkMetered(); |
| + // Note that this is the same critierion that the JobScheduler uses to schedule the |
| + // job. JobScheduler will call onStopJob causing our upload to be interrupted when |
| + // our network requirements no longer hold. |
| + return CrashReportingNetworkPermissionManager.isNetworkUnmetered( |
|
Ilya Sherman
2017/03/17 01:19:02
This class name is a bit unwieldy. WDYT -- any su
|
| + mConnectivityManager); |
| } |
| @Override |
| public boolean isCrashUploadDisabledByCommandLine() { |