From 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 20 Mar 2017 08:50:25 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/150622237

Test: make, treehugger, on device testing.

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/150392808 (3/16/2017) to cl/150622237 (3/20/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Id53e0e580a4ef73760a8afb7bb8c265ee27ad535
---
 java/com/android/dialer/callcomposer/CallComposerActivity.java    | 2 +-
 java/com/android/dialer/callcomposer/CameraComposerFragment.java  | 5 ++++-
 java/com/android/dialer/callcomposer/GalleryComposerFragment.java | 4 ++--
 java/com/android/dialer/callcomposer/camera/CameraManager.java    | 6 +++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'java/com/android/dialer/callcomposer')

diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index f73563ff8..183d12980 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -305,7 +305,7 @@ public class CallComposerActivity extends AppCompatActivity
 
                     @Override
                     public void onCopyFailed(Throwable throwable) {
-                      // TODO(b/33753902)
+                      // TODO(b/34279096) - gracefully handle message failure
                       LogUtil.e("CallComposerActivity.onCopyFailed", "copy Failed", throwable);
                     }
                   })
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index 583fb5446..ebd032199 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -366,7 +366,10 @@ public class CameraComposerFragment extends CallComposerFragment
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-    outState.putInt(CAMERA_DIRECTION_KEY, CameraManager.get().getCameraInfo().facing);
+
+    CameraInfo cameraInfo = CameraManager.get().getCameraInfo();
+    int facing = cameraInfo == null ? CameraInfo.CAMERA_FACING_BACK : cameraInfo.facing;
+    outState.putInt(CAMERA_DIRECTION_KEY, facing);
     outState.putParcelable(CAMERA_URI_KEY, cameraUri);
   }
 
diff --git a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
index b53d6a9d6..1d684a2d3 100644
--- a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
@@ -277,14 +277,14 @@ public class GalleryComposerFragment extends CallComposerFragment
 
                 @Override
                 public void onCopyFailed(Throwable throwable) {
-                  // TODO(b/33753902)
+                  // TODO(b/34279096) - gracefully handle message failure
                   LogUtil.e(
                       "GalleryComposerFragment.onFailure", "Data preparation failed", throwable);
                 }
               })
           .execute();
     } else {
-      // TODO(b/33753902)
+      // TODO(b/34279096) - gracefully handle message failure
     }
   }
 }
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 87cd16a99..4cc08ba32 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -23,6 +23,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Looper;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.MotionEvent;
@@ -305,6 +306,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }
   }
 
+  @Nullable
   @VisibleForTesting
   public CameraInfo getCameraInfo() {
     if (mCameraIndex == NO_CAMERA_SELECTED) {
@@ -516,7 +518,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
     final WindowManager windowManager =
         (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
 
-    int degrees = 0;
+    int degrees;
     switch (windowManager.getDefaultDisplay().getRotation()) {
       case Surface.ROTATION_0:
         degrees = 0;
@@ -530,6 +532,8 @@ public class CameraManager implements FocusOverlayManager.Listener {
       case Surface.ROTATION_270:
         degrees = 270;
         break;
+      default:
+        throw Assert.createAssertionFailException("");
     }
 
     // The display orientation of the camera (this controls the preview image).
-- 
cgit v1.2.3