[Crash Reporting] Only upload Chrome crash reports over unmetered networks.

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences.privacy;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeSwitches;
 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.
  */
 public class PrivacyPreferencesManager implements CrashReportingPermissionManager{
     static final String DEPRECATED_PREF_CRASH_DUMP_UPLOAD = "crash_dump_upload";
     static final String DEPRECATED_PREF_CRASH_DUMP_UPLOAD_NO_CELLULAR =
             "crash_dump_upload_no_cellular";
     private static final String DEPRECATED_PREF_CELLULAR_EXPERIMENT = "cellular_experiment";
 
@@ skipping 147 matching lines @@
         // Delete bool PREF_NETWORK_PREDICTIONS so that string values can be stored. Note that this
         // SharedPreference carries no information, because it used to be overwritten by
         // kNetworkPredictionEnabled on startup, and now it is overwritten by
         // kNetworkPredictionOptions on startup.
         if (mSharedPreferences.contains(PREF_NETWORK_PREDICTIONS)) {
             sharedPreferencesEditor.remove(PREF_NETWORK_PREDICTIONS);
         }
         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);
         // Android telephony team said it is OK to continue using getNetworkInfo() for our purposes.
         // We cannot use ConnectivityManager#getAllNetworks() because that one only reports enabled
         // networks. See crbug.com/532455.
         @SuppressWarnings("deprecation")
         NetworkInfo networkInfo = connectivityManager
                 .getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
         return networkInfo != null;
@@ skipping 52 matching lines @@
         return mSharedPreferences.getBoolean(PREF_METRICS_IN_SAMPLE, true);
     }
 
     /**
      * Checks whether uploading of crash dumps is permitted for the available network(s).
      *
      * @return whether uploading crash dumps is permitted.
      */
     @Override
     public boolean isNetworkAvailableForCrashUploads() {
-        return isNetworkAvailable() && isWiFiOrEthernetNetwork();
+        ConnectivityManager connectivityManager =
+                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+        return NetworkPermissionUtil.isNetworkUnmetered(connectivityManager);
     }
 
     /**
      * Checks whether uploading of usage metrics and crash dumps is currently permitted, based on
      * user consent only. This doesn't take network condition or experimental state (i.e. disabling
      * upload) into consideration. A crash dump may be retried if this check passes.
      *
      * @return whether the user has consented to reporting usage metrics and crash dumps.
      */
     @Override
@@ skipping 52 matching lines @@
     /**
      * Check whether Physical Web is configured to notify on nearby beacons.
      *
      * @return boolean {@code true} if the feature is enabled.
      */
     public boolean isPhysicalWebEnabled() {
         int state = mSharedPreferences.getInt(PREF_PHYSICAL_WEB, PHYSICAL_WEB_ONBOARDING);
         return (state == PHYSICAL_WEB_ON);
     }
 }