[Android Crash Reporting] Allow uploading minidumps via the JobScheduler

chrome/android/java/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnable.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.Build;
 import android.util.Patterns;
 
@@ skipping 105 matching lines @@
      * @param context The application context for accessing the cache directory and firing intents.
      * @param minidump The minidump file that needs logcat output to be attached.
      */
     public LogcatExtractionRunnable(Context context, File minidump) {
         mContext = context;
         mMinidumpFile = minidump;
     }
 
     @Override
     public void run() {
-        Log.i(TAG, "Trying to extract logcat for minidump " + mMinidumpFile.getName());
+        Log.i(TAG, "Trying to extract logcat for minidump %s.", mMinidumpFile.getName());
         CrashFileManager fileManager = new CrashFileManager(mContext.getCacheDir());
         File fileToUpload = mMinidumpFile;
         try {
             List<String> logcat = getElidedLogcat();
             fileToUpload = new MinidumpLogcatPrepender(fileManager, mMinidumpFile, logcat).run();
+            Log.i(TAG, "Succeeded extracting logcat to %s.", fileToUpload.getName());
         } catch (IOException | InterruptedException e) {
             Log.w(TAG, e.toString());
         }
 
         // Regardless of success, initiate the upload. That way, even if there are errors augmenting
         // the minidump with logcat data, the service can still upload the unaugmented minidump.
-        try {
-            MinidumpUploadService.tryUploadCrashDump(mContext, fileToUpload);
-        } catch (SecurityException e) {
-            // For KitKat and below, there was a framework bug which causes us to not be able to
-            // find our own crash uploading service. Ignore a SecurityException here on older
-            // OS versions since the crash will eventually get uploaded on next start.
-            // crbug/542533
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                throw e;
+        if (MinidumpUploadService.shouldUseJobSchedulerForUploads()) {
+            MinidumpUploadService.scheduleUploadJob(mContext);
+        } else {
+            try {
+                MinidumpUploadService.tryUploadCrashDump(mContext, fileToUpload);
+            } catch (SecurityException e) {
+                // For KitKat and below, there was a framework bug which causes us to not be able to
+                // find our own crash uploading service. Ignore a SecurityException here on older
+                // OS versions since the crash will eventually get uploaded on next start.
+                // crbug/542533
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    throw e;
+                }
             }
         }
     }
 
     private List<String> getElidedLogcat() throws IOException, InterruptedException {
         List<String> rawLogcat = getLogcat();
         return Collections.unmodifiableList(elideLogcat(rawLogcat));
     }
 
     @VisibleForTesting
@@ skipping 169 matching lines @@
      * {@link #CONSOLE_ELISION}.
      *
      * @param original String potentially containing console messages.
      * @return String with elided console messages.
      */
     @VisibleForTesting
     protected static String elideConsole(String original) {
         return CONSOLE_MSG.matcher(original).replaceAll(CONSOLE_ELISION);
     }
 }