diff options
| author | Igor Murashkin <iam@google.com> | 2014-09-05 22:44:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 22:44:44 +0000 |
| commit | d5205c2648ba1213f28a232379d10b07a7ee9bdc (patch) | |
| tree | 1cc16ab8cca825f50acfee861a8a57d4baa361c5 /camera2 | |
| parent | bb013aa3e197e881756be5ad13e6ad30bfb4aeff (diff) | |
| parent | dc05ed7a8443af7c1a7b1bb39519d09d79284e42 (diff) | |
| download | android_frameworks_ex-d5205c2648ba1213f28a232379d10b07a7ee9bdc.tar.gz android_frameworks_ex-d5205c2648ba1213f28a232379d10b07a7ee9bdc.tar.bz2 android_frameworks_ex-d5205c2648ba1213f28a232379d10b07a7ee9bdc.zip | |
Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
Diffstat (limited to 'camera2')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java | 2 |
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 d668f85..540d8df 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java @@ -206,7 +206,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()); |