[Android Crash Reporting] Allow uploading minidumps via the JobScheduler

chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.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;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Looper;
@@ skipping 307 matching lines @@
                 // Likewise, there might be pending metrics from previous runs when crash reporting
                 // was enabled.
                 MinidumpUploadService.storeBreakpadUploadStatsInUma(
                         ChromePreferenceManager.getInstance());
 
                 // Now check whether crash reporting is enabled. If it is, broadcast the appropriate
                 // permission.
                 boolean crashReportingDisabled = CommandLine.getInstance().hasSwitch(
                         ChromeSwitches.DISABLE_CRASH_DUMP_UPLOAD);
                 if (crashReportingDisabled) return;
+                PrivacyPreferencesManager.getInstance().enablePotentialCrashUploading();
 
                 RecordHistogram.recordLongTimesHistogram("UMA.Debug.EnableCrashUpload.Uptime3",
                         mAsyncTaskStartTime - UmaUtils.getForegroundStartTime(),
                         TimeUnit.MILLISECONDS);
-                PrivacyPreferencesManager.getInstance().enablePotentialCrashUploading();
 
                 // Finally, uploading any pending crash reports.
                 File[] minidumps = crashFileManager.getAllMinidumpFiles(
                         MinidumpUploadService.MAX_TRIES_ALLOWED);
                 int numMinidumpsSansLogcat = 0;
                 for (File minidump : minidumps) {
                     if (CrashFileManager.isMinidumpMIMEFirstTry(minidump.getName())) {
                         ++numMinidumpsSansLogcat;
                     }
                 }
                 // TODO(isherman): These two histograms are intended to be temporary, and can
                 // probably be removed around the M60 timeframe: http://crbug.com/699785
                 RecordHistogram.recordSparseSlowlyHistogram(
                         "Stability.Android.PendingMinidumpsOnStartup", minidumps.length);
                 RecordHistogram.recordSparseSlowlyHistogram(
                         "Stability.Android.PendingMinidumpsOnStartup.SansLogcat",
                         numMinidumpsSansLogcat);
                 if (minidumps.length == 0) return;
 
                 Log.i(TAG, "Attempting to upload %d accumulated crash dumps.", minidumps.length);
                 File mostRecentMinidump = minidumps[0];
                 if (doesCrashMinidumpNeedLogcat(mostRecentMinidump)) {
                     AsyncTask.THREAD_POOL_EXECUTOR.execute(
                             new LogcatExtractionRunnable(mAppContext, mostRecentMinidump));
+
+                    // The JobScheduler will schedule uploads for all of the available minidumps
+                    // once the logcat is attached. But if the JobScheduler API is not being used,
+                    // then the logcat extraction process will only initiate an upload for the first
+                    // minidump; it's required to manually initiate uploads for all of the remaining
+                    // minidumps.
+                    if (!MinidumpUploadService.shouldUseJobSchedulerForUploads()) {
+                        List<File> remainingMinidumps =
+                                Arrays.asList(minidumps).subList(1, minidumps.length);
+                        for (File minidump : remainingMinidumps) {
+                            MinidumpUploadService.tryUploadCrashDump(mAppContext, minidump);
+                        }
+                    }
+                } else if (MinidumpUploadService.shouldUseJobSchedulerForUploads()) {
+                    MinidumpUploadService.scheduleUploadJob(mAppContext);
                 } else {
-                    MinidumpUploadService.tryUploadCrashDump(mAppContext, mostRecentMinidump);
-                }
-                // TODO(isherman): Once there is support implemented for the JobScheduler API,
-                // we should only explicitly upload the remaining files here if not using that
-                // API. If we *are* using the JobScheduler API, then the JobScheduler will
-                // schedule uploads for all of the available minidumps once the logcat is
-                // attached.
-                List<File> remainingMinidumps =
-                        Arrays.asList(minidumps).subList(1, minidumps.length);
-                for (File minidump : remainingMinidumps) {
-                    MinidumpUploadService.tryUploadCrashDump(mAppContext, minidump);
+                    MinidumpUploadService.tryUploadAllCrashDumps(mAppContext);
                 }
             }
 
             /**
              * Returns whether or not it's appropriate to try to extract recent logcat output and
              * include that logcat output alongside the given {@param minidump} in a crash report.
              * Logcat output should only be extracted if (a) it hasn't already been extracted for
              * this minidump file, and (b) the minidump is fairly fresh. The freshness check is
              * important for two reasons: (1) First of all, it helps avoid including irrelevant
              * logcat output for a crash report. (2) Secondly, it provides an escape hatch that can
@@ skipping 71 matching lines @@
     }
 
     /**
      * @return Whether deferred startup has been completed.
      */
     @VisibleForTesting
     public boolean isDeferredStartupCompleteForApp() {
         return mDeferredStartupCompletedForApp;
     }
 }