[Android WebView] Always schedule new upload job after copying minidump.

android_webview/java/src/org/chromium/android_webview/crash/CrashReceiverService.java

 // Copyright 2016 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.android_webview.crash;
 
 import android.annotation.TargetApi;
 import android.app.Service;
 import android.app.job.JobInfo;
 import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.minidump_uploader.CrashFileManager;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 
 /**
  * Service that is responsible for receiving crash dumps from an application, for upload.
  */
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class CrashReceiverService extends Service {
     private static final String TAG = "CrashReceiverService";
 
     private static final String WEBVIEW_CRASH_DIR = "WebView_Crashes";
     private static final String WEBVIEW_TMP_CRASH_DIR = "WebView_Crashes_Tmp";
@@ skipping 33 matching lines @@
             ParcelFileDescriptor[] fileDescriptors, boolean scheduleUploads) {
         if (!waitUntilWeCanCopy()) {
             Log.e(TAG, "something went wrong when waiting to copy minidumps, bailing!");
             return;
         }
 
         try {
             boolean copySucceeded = copyMinidumps(context, uid, fileDescriptors);
             if (copySucceeded && scheduleUploads) {
                 // Only schedule a new job if there actually are any files to upload.
-                scheduleNewJobIfNoJobsActive();
+                scheduleNewJob();
             }
         } finally {
             synchronized (mCopyingLock) {
                 mIsCopying = false;
                 mCopyingLock.notifyAll();
             }
         }
     }
 
     /**
      * Wait until we are allowed to copy minidumps.
      * @return whether we are actually allowed to copy the files - if false we should just bail.
      */
     private boolean waitUntilWeCanCopy() {
         synchronized (mCopyingLock) {
             while (mIsCopying) {
                 try {
                     mCopyingLock.wait();
                 } catch (InterruptedException e) {
                     Log.e(TAG, "Was interrupted when waiting to copy minidumps", e);
                     return false;
                 }
             }
             mIsCopying = true;
             return true;
         }
     }
 
-    /**
-     * @return the currently pending job with ID MINIDUMP_UPLOADING_JOB_ID, or null if no such job
-     * exists.
-     */
-    private static JobInfo getCurrentPendingJob(JobScheduler jobScheduler) {
-        List<JobInfo> pendingJobs = jobScheduler.getAllPendingJobs();
-        for (JobInfo job : pendingJobs) {
-            if (job.getId() == MINIDUMP_UPLOADING_JOB_ID) return job;
-        }
-        return null;
-    }
-
-    private void scheduleNewJobIfNoJobsActive() {
+    private void scheduleNewJob() {
         JobScheduler jobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
-        if (getCurrentPendingJob(jobScheduler) != null) {
-            return;
-        }
         JobInfo newJob = new JobInfo
                 .Builder(MINIDUMP_UPLOADING_JOB_ID /* jobId */,
                     new ComponentName(this, MinidumpUploadJobService.class))
                 .setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED)
                 // Minimum delay when a job is retried (a retry will happen when there are minidumps
                 // left after trying to upload all minidumps - this could e.g. happen if we add more
                 // minidumps at the same time as uploading old ones).
                 .setBackoffCriteria(JOB_BACKOFF_TIME_IN_MS, JOB_BACKOFF_POLICY)
                 .build();
         if (jobScheduler.schedule(newJob) == JobScheduler.RESULT_FAILURE) {
@@ skipping 91 matching lines @@
     @VisibleForTesting
     public static File getWebViewTmpCrashDir(Context context) {
         return new File(context.getCacheDir(), WEBVIEW_TMP_CRASH_DIR);
     }
 
     @Override
     public IBinder onBind(Intent intent) {
         return mBinder;
     }
 }