From dc05ed7a8443af7c1a7b1bb39519d09d79284e42 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Fri, 5 Sep 2014 11:40:40 -0700
Subject: portability: Fix incorrect comparison between int and Integer

Bug: 17405119
Change-Id: Ic4828b5ddee2b11fa9886506e48c640a4c5ad3ef
---
 .../src/com/android/ex/camera2/portability/AndroidCamera2Settings.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'camera2')

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
index 7f6cffe..a286fb8 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
@@ -192,7 +192,7 @@ public class AndroidCamera2Settings extends CameraSettings {
         } else if (setting == CONTROL_AF_REGIONS) {
             return mFocusAreas.size() == 0;
         } else if (setting == CONTROL_AE_TARGET_FPS_RANGE) {
-            Range defaultFpsRange = mTemplateSettings.get(CONTROL_AE_TARGET_FPS_RANGE);
+            Range<Integer> defaultFpsRange = mTemplateSettings.get(CONTROL_AE_TARGET_FPS_RANGE);
             return (mPreviewFpsRangeMin == 0 && mPreviewFpsRangeMax == 0) ||
                     (defaultFpsRange != null && mPreviewFpsRangeMin == defaultFpsRange.getLower() &&
                             mPreviewFpsRangeMax == defaultFpsRange.getUpper());
-- 
cgit v1.2.3