diff options
| author | Igor Murashkin <iam@google.com> | 2014-09-05 22:56:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 22:56:51 +0000 |
| commit | 46637f4b11090250fb16ce27e50b012351c750e6 (patch) | |
| tree | 1cc16ab8cca825f50acfee861a8a57d4baa361c5 | |
| parent | 3d63c61135a25a725dba50180c21254eb436e3b2 (diff) | |
| parent | d5205c2648ba1213f28a232379d10b07a7ee9bdc (diff) | |
| download | android_frameworks_ex-46637f4b11090250fb16ce27e50b012351c750e6.tar.gz android_frameworks_ex-46637f4b11090250fb16ce27e50b012351c750e6.tar.bz2 android_frameworks_ex-46637f4b11090250fb16ce27e50b012351c750e6.zip | |
am d5205c26: Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev
* commit 'd5205c2648ba1213f28a232379d10b07a7ee9bdc':
portability: Fix incorrect comparison between int and Integer
| -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()); |