Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)

This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):

  git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
  git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef

Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436

1 files changed, 20 insertions, 13 deletions

diff --git a/java/com/android/voicemail/impl/DeviceProvisionedJobService.java b/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
index a0b999d23..20993d051 100644
--- a/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
+++ b/java/com/android/voicemail/impl/DeviceProvisionedJobService.java
@@ -29,6 +29,7 @@ import android.content.Intent;
 import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.constants.ScheduledJobIds;
 
@@ -39,29 +40,25 @@ import com.android.dialer.constants.ScheduledJobIds;
 @TargetApi(VERSION_CODES.O)
 public class DeviceProvisionedJobService extends JobService {
 
-  private static final String EXTRA_PHONE_ACCOUNT_HANDLE = "EXTRA_PHONE_ACCOUNT_HANDLE";
+  @VisibleForTesting static final String EXTRA_PHONE_ACCOUNT_HANDLE = "EXTRA_PHONE_ACCOUNT_HANDLE";
 
   /** Queue the phone account to be reactivated after the setup wizard has completed. */
   public static void activateAfterProvisioned(
       Context context, PhoneAccountHandle phoneAccountHandle) {
-    JobInfo jobInfo =
-        new JobInfo.Builder(
-                ScheduledJobIds.VVM_DEVICE_PROVISIONED_JOB,
-                new ComponentName(context, DeviceProvisionedJobService.class))
-            .addTriggerContentUri(
-                new TriggerContentUri(Global.getUriFor(Global.DEVICE_PROVISIONED), 0))
-            // VVM activation must be run as soon as possible to avoid voicemail loss
-            .setTriggerContentMaxDelay(0)
-            .build();
-
     Intent intent = new Intent();
     intent.putExtra(EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
-    context.getSystemService(JobScheduler.class).enqueue(jobInfo, new JobWorkItem(intent));
+    context
+        .getSystemService(JobScheduler.class)
+        .enqueue(createJobInfo(context), new JobWorkItem(intent));
   }
 
   @Override
   public boolean onStartJob(JobParameters params) {
-    Assert.isTrue(isDeviceProvisioned());
+    if (!isDeviceProvisioned()) {
+      VvmLog.i("DeviceProvisionedJobService.onStartJob", "device not provisioned, rescheduling");
+      getSystemService(JobScheduler.class).schedule(createJobInfo(this));
+      return false; // job not running in background
+    }
     VvmLog.i("DeviceProvisionedJobService.onStartJob", "device provisioned");
     for (JobWorkItem item = params.dequeueWork(); item != null; item = params.dequeueWork()) {
       PhoneAccountHandle phoneAccountHandle =
@@ -82,4 +79,14 @@ public class DeviceProvisionedJobService extends JobService {
   private boolean isDeviceProvisioned() {
     return Settings.Global.getInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) == 1;
   }
+
+  private static JobInfo createJobInfo(Context context) {
+    return new JobInfo.Builder(
+            ScheduledJobIds.VVM_DEVICE_PROVISIONED_JOB,
+            new ComponentName(context, DeviceProvisionedJobService.class))
+        .addTriggerContentUri(new TriggerContentUri(Global.getUriFor(Global.DEVICE_PROVISIONED), 0))
+        // VVM activation must be run as soon as possible to avoid voicemail loss
+        .setTriggerContentMaxDelay(0)
+        .build();
+  }
 }