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 3b0e9218fe1781c83c42af73c0362618b6c4f61f..757286552ed1e087ab3e1b5e6a15b6002de10cfd 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 |
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.device.DeviceClassManager; |
import org.chromium.chrome.browser.physicalweb.PhysicalWeb; |
import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager; |
+import org.chromium.components.minidump_uploader.util.NetworkPermissionUtil; |
/** |
* Reads, writes, and migrates preferences related to network usage and privacy. |
@@ -184,24 +185,13 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage |
sharedPreferencesEditor.apply(); |
} |
- private NetworkInfo getActiveNetworkInfo() { |
+ protected boolean isNetworkAvailable() { |
ConnectivityManager connectivityManager = |
(ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); |
- return connectivityManager.getActiveNetworkInfo(); |
- } |
- |
- protected boolean isNetworkAvailable() { |
- NetworkInfo networkInfo = getActiveNetworkInfo(); |
+ NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo(); |
return (networkInfo != null && networkInfo.isConnected()); |
} |
- protected boolean isWiFiOrEthernetNetwork() { |
- NetworkInfo networkInfo = getActiveNetworkInfo(); |
- return networkInfo != null |
- && (networkInfo.getType() == ConnectivityManager.TYPE_WIFI |
- || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET); |
- } |
- |
protected boolean isMobileNetworkCapable() { |
ConnectivityManager connectivityManager = |
(ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); |
@@ -274,7 +264,9 @@ public class PrivacyPreferencesManager implements CrashReportingPermissionManage |
*/ |
@Override |
public boolean isNetworkAvailableForCrashUploads() { |
- return isNetworkAvailable() && isWiFiOrEthernetNetwork(); |
+ ConnectivityManager connectivityManager = |
+ (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); |
+ return NetworkPermissionUtil.isNetworkUnmetered(connectivityManager); |
} |
/** |