From 30ccc4f3aa6da94f0bb8a01a880a6353b883b263 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 20 Mar 2017 20:40:36 +0000
Subject: Revert "Update AOSP Dialer source from internal google3 repository at
 cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6
---
 java/com/android/dialer/callcomposer/camera/CameraManager.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

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).
-- 
cgit v1.2.3