Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6

4 files changed, 5 insertions, 12 deletions

diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index 183d12980..f73563ff8 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/34279096) - gracefully handle message failure
+                      // TODO(b/33753902)
                       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 ebd032199..583fb5446 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -366,10 +366,7 @@ public class CameraComposerFragment extends CallComposerFragment
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-
-    CameraInfo cameraInfo = CameraManager.get().getCameraInfo();
-    int facing = cameraInfo == null ? CameraInfo.CAMERA_FACING_BACK : cameraInfo.facing;
-    outState.putInt(CAMERA_DIRECTION_KEY, facing);
+    outState.putInt(CAMERA_DIRECTION_KEY, CameraManager.get().getCameraInfo().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 1d684a2d3..b53d6a9d6 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/34279096) - gracefully handle message failure
+                  // TODO(b/33753902)
                   LogUtil.e(
                       "GalleryComposerFragment.onFailure", "Data preparation failed", throwable);
                 }
               })
           .execute();
     } else {
-      // TODO(b/34279096) - gracefully handle message failure
+      // TODO(b/33753902)
     }
   }
 }
diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java
index 4cc08ba32..87cd16a99 100644
--- a/java/com/android/dialer/callcomposer/camera/CameraManager.java
+++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java
@@ -23,7 +23,6 @@ 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;
@@ -306,7 +305,6 @@ public class CameraManager implements FocusOverlayManager.Listener {
     }
   }
 
-  @Nullable
   @VisibleForTesting
   public CameraInfo getCameraInfo() {
     if (mCameraIndex == NO_CAMERA_SELECTED) {
@@ -518,7 +516,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
     final WindowManager windowManager =
         (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE);
 
-    int degrees;
+    int degrees = 0;
     switch (windowManager.getDefaultDisplay().getRotation()) {
       case Surface.ROTATION_0:
         degrees = 0;
@@ -532,8 +530,6 @@ 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).