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

5 files changed, 62 insertions, 29 deletions

diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 5915ce331..f79f6548c 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -35,6 +35,7 @@ import com.android.dialer.callcomposer.camera.camerafocus.FocusOverlayManager;
 import com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutors;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -118,7 +119,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
   /**
    * The task for opening the camera, so it doesn't block the UI thread Using AsyncTask rather than
    * SafeAsyncTask because the tasks need to be serialized, but don't need to be on the UI thread
-   * TODO: If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need
+   * TODO(blemmon): If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need
    * to create a dedicated thread, or synchronize the threads in the thread pool
    */
   private AsyncTask<Integer, Void, Camera> mOpenCameraTask;
@@ -457,9 +458,9 @@ public class CameraManager implements FocusOverlayManager.Listener {
             int height;
             if (mRotation == 90 || mRotation == 270) {
               // Is rotated, so swapping dimensions is desired
-              //noinspection SuspiciousNameCombination
+              // noinspection SuspiciousNameCombination
               width = size.height;
-              //noinspection SuspiciousNameCombination
+              // noinspection SuspiciousNameCombination
               height = size.width;
             } else {
               width = size.width;
@@ -467,9 +468,20 @@ public class CameraManager implements FocusOverlayManager.Listener {
             }
             LogUtil.i(
                 "CameraManager.onPictureTaken", "taken picture size: " + bytes.length + " bytes");
-            new ImagePersistTask(
-                    width, height, heightPercent, bytes, mCameraPreview.getContext(), callback)
-                .execute();
+            DialerExecutors.createNonUiTaskBuilder(
+                    new ImagePersistWorker(
+                        width, height, heightPercent, bytes, mCameraPreview.getContext()))
+                .onSuccess(
+                    (result) -> {
+                      callback.onMediaReady(
+                          result.getUri(), "image/jpeg", result.getWidth(), result.getHeight());
+                    })
+                .onFailure(
+                    (throwable) -> {
+                      callback.onMediaFailed(new Exception("Persisting image failed", throwable));
+                    })
+                .build()
+                .executeSerial(null);
           }
         };
 
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
index 8620701fe..26b0bde00 100644
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
@@ -22,13 +22,16 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
+import com.android.dialer.callcomposer.camera.ImagePersistWorker.Result;
 import com.android.dialer.callcomposer.camera.exif.ExifInterface;
 import com.android.dialer.callcomposer.util.BitmapResizer;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.concurrent.FallibleAsyncTask;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.util.DialerUtils;
+import com.google.auto.value.AutoValue;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -36,52 +39,70 @@ import java.io.OutputStream;
 
 /** Persisting image routine. */
 @TargetApi(VERSION_CODES.M)
-public class ImagePersistTask extends FallibleAsyncTask<Void, Void, Uri> {
+public class ImagePersistWorker implements Worker<Void, Result> {
   private int mWidth;
   private int mHeight;
   private final float mHeightPercent;
   private final byte[] mBytes;
   private final Context mContext;
-  private final CameraManager.MediaCallback mCallback;
 
-  ImagePersistTask(
+  @AutoValue
+  abstract static class Result {
+
+    public static Builder builder() {
+      return new AutoValue_ImagePersistWorker_Result.Builder();
+    }
+
+    @NonNull
+    abstract Uri getUri();
+
+    abstract int getWidth();
+
+    abstract int getHeight();
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder setUri(@NonNull Uri uri);
+
+      abstract Builder setWidth(int width);
+
+      abstract Builder setHeight(int height);
+
+      abstract Result build();
+    }
+  }
+
+  ImagePersistWorker(
       final int width,
       final int height,
       final float heightPercent,
       final byte[] bytes,
-      final Context context,
-      final CameraManager.MediaCallback callback) {
+      final Context context) {
     Assert.checkArgument(heightPercent >= 0 && heightPercent <= 1);
     Assert.isNotNull(bytes);
     Assert.isNotNull(context);
-    Assert.isNotNull(callback);
     mWidth = width;
     mHeight = height;
     mHeightPercent = heightPercent;
     mBytes = bytes;
     mContext = context;
-    mCallback = callback;
   }
 
   @Override
-  protected Uri doInBackgroundFallible(final Void... params) throws Exception {
+  public Result doInBackground(Void unused) throws Exception {
     File outputFile = DialerUtils.createShareableFile(mContext);
 
     try (OutputStream outputStream = new FileOutputStream(outputFile)) {
       writeClippedBitmap(outputStream);
     }
 
-    return FileProvider.getUriForFile(
-        mContext, Constants.get().getFileProviderAuthority(), outputFile);
-  }
-
-  @Override
-  protected void onPostExecute(FallibleTaskResult<Uri> result) {
-    if (result.isFailure()) {
-      mCallback.onMediaFailed(new Exception("Persisting image failed", result.getThrowable()));
-    } else {
-      mCallback.onMediaReady(result.getResult(), "image/jpeg", mWidth, mHeight);
-    }
+    return Result.builder()
+        .setUri(
+            FileProvider.getUriForFile(
+                mContext, Constants.get().getFileProviderAuthority(), outputFile))
+        .setWidth(mWidth)
+        .setHeight(mHeight)
+        .build();
   }
 
   private void writeClippedBitmap(OutputStream outputStream) throws IOException {
diff --git a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
index 1c5ac380c..a5edf3309 100644
--- a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
+++ b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java
@@ -389,7 +389,7 @@ public class FocusOverlayManager {
       focusIndicator.showStart();
     } else {
       if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) {
-        // TODO: check HAL behavior and decide if this can be removed.
+        // TODO(blemmon): check HAL behavior and decide if this can be removed.
         focusIndicator.showSuccess(false);
       } else if (mState == STATE_SUCCESS) {
         focusIndicator.showSuccess(false);
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
index 23d748c17..c728845a1 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java
@@ -499,7 +499,7 @@ public class ExifParser {
       mTiffStream.skip(4);
       return null;
     }
-    // TODO: handle numOfComp overflow
+    // TODO(blemmon): handle numOfComp overflow
     ExifTag tag =
         new ExifTag(
             tagId,
diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
index a254ae93b..9a03c103c 100644
--- a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
+++ b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java
@@ -187,7 +187,7 @@ public class ExifTag {
 
   /** Gets the component count of this tag. */
 
-  // TODO: fix integer overflows with this
+  // TODO(blemmon): fix integer overflows with this
   int getComponentCount() {
     return mComponentCountActual;
   }