Use util.Size to replace Camera.Size.

Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 3a51d2901..7f4a8c503 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -35,7 +35,6 @@ import android.graphics.RectF;
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
 import android.location.Location;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
@@ -466,11 +465,11 @@ public class CameraUtil {
         return orientationHistory;
     }
 
-    private static Point getDefaultDisplaySize(Context context, Point size) {
+    private static Size getDefaultDisplaySize(Context context, Point size) {
         WindowManager windowManager = (WindowManager) context
                 .getSystemService(Context.WINDOW_SERVICE);
         windowManager.getDefaultDisplay().getSize(size);
-        return size;
+        return new Size(size);
     }
 
     public static Size getOptimalPreviewSize(Context context,
@@ -503,8 +502,8 @@ public class CameraUtil {
         // wrong size of preview surface. When we change the preview size, the
         // new overlay will be created before the old one closed, which causes
         // an exception. For now, just get the screen size.
-        Point point = getDefaultDisplaySize(context, new Point());
-        int targetHeight = Math.min(point.x, point.y);
+        Size defaultDisplaySize = getDefaultDisplaySize(context, new Point());
+        int targetHeight = Math.min(defaultDisplaySize.width, defaultDisplaySize.height);
         // Try to find an size match aspect ratio and size
         for (int i = 0; i < sizes.length; i++) {
             Point size = sizes[i];