[minidump uploader] Retries: only initiate uploads when on WiFi/Ethernet

chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadRetry.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.crash;
 
 import android.content.Context;
 import android.os.Handler;
 
 import org.chromium.base.NonThreadSafe;
 import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.net.ConnectionType;
+import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 import org.chromium.net.NetworkChangeNotifier;
 
 /**
  * This class listens to network changes and determine when it would good to
  * retry uploading minidumps.
  */
 class MinidumpUploadRetry implements NetworkChangeNotifier.ConnectionTypeObserver {
     private final Context mContext;
+    private final CrashReportingPermissionManager mPermissionManager;
     private static MinidumpUploadRetry sSingleton;
 
     private static class Scheduler implements Runnable {
         private static NonThreadSafe sThreadCheck;
         private final Context mContext;
+        private final CrashReportingPermissionManager mPermissionManager;
 
-        private Scheduler(Context context) {
+        private Scheduler(Context context, CrashReportingPermissionManager permissionManager) {
             this.mContext = context;
+            mPermissionManager = permissionManager;
         }
 
         @Override
         public void run() {
             if (sThreadCheck == null) {
                 sThreadCheck = new NonThreadSafe();
             }
             // Make sure this is called on the same thread all the time.
             assert sThreadCheck.calledOnValidThread();
             if (!NetworkChangeNotifier.isInitialized()) {
                 return;
             }
             if (sSingleton == null) {
-                sSingleton = new MinidumpUploadRetry(mContext);
+                sSingleton = new MinidumpUploadRetry(mContext, mPermissionManager);
             }
         }
     }
 
     /**
      * Schedule a retry. If there is already one schedule, this is NO-OP.
      */
-    static void scheduleRetry(Context context) {
+    static void scheduleRetry(Context context, CrashReportingPermissionManager permissionManager) {
         // NetworkChangeNotifier is not thread safe. We will post to UI thread
         // instead since that's where it fires off notification changes.
-        new Handler(context.getMainLooper()).post(new Scheduler(context));
+        new Handler(context.getMainLooper()).post(new Scheduler(context, permissionManager));
     }
 
-    private MinidumpUploadRetry(Context context) {
+    private MinidumpUploadRetry(
+            Context context, CrashReportingPermissionManager permissionManager) {
         this.mContext = context;
+        this.mPermissionManager = permissionManager;
         NetworkChangeNotifier.addConnectionTypeObserver(this);
     }
 
     @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
     @Override
     public void onConnectionTypeChanged(int connectionType) {
-        // Look for "favorable" connections. Note that we never
-        // know what the user's crash upload preference is until
-        // the time when we are actually uploading.
-        if (connectionType == ConnectionType.CONNECTION_NONE) {
+        if (!mPermissionManager.isNetworkAvailableForCrashUploads()) {

[Maria, 2017/01/03 19:28:41]

As a small optimization I would keep the check for connectionType==NONE here. We
will definitely not be able to upload anything without a connection and this way
we'll avoid the extra system calls in the permission manager.

[gsennton, 2017/01/03 20:00:35]

Done.

             return;
         }
         MinidumpUploadService.tryUploadAllCrashDumps(mContext);
         NetworkChangeNotifier.removeConnectionTypeObserver(this);
         sSingleton = null;
     }
 }