summaryrefslogtreecommitdiffstats
path: root/camera2
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-09-05 11:40:40 -0700
committerIgor Murashkin <iam@google.com>2014-09-05 11:42:08 -0700
commitdc05ed7a8443af7c1a7b1bb39519d09d79284e42 (patch)
tree47a021a6d5f7188257f7067c6295a9e310e01cea /camera2
parentf27e71f979e803a3ac00f4057eb909886d957a3e (diff)
downloadandroid_frameworks_ex-dc05ed7a8443af7c1a7b1bb39519d09d79284e42.tar.gz
android_frameworks_ex-dc05ed7a8443af7c1a7b1bb39519d09d79284e42.tar.bz2
android_frameworks_ex-dc05ed7a8443af7c1a7b1bb39519d09d79284e42.zip
portability: Fix incorrect comparison between int and Integer
Bug: 17405119 Change-Id: Ic4828b5ddee2b11fa9886506e48c640a4c5ad3ef
Diffstat (limited to 'camera2')
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java2
1 files changed, 1 insertions, 1 deletions
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());