diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-01 09:16:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 09:16:07 -0800 |
| commit | 7da8fbcfe7f132e714663def4f9e7bac9a30a68e (patch) | |
| tree | 5644311898a4f174ec3eb5eb37c57879ba68eca4 /src | |
| parent | 4b2ef26d514b4202c857584a6b4118cd11a9098d (diff) | |
| parent | 48f1ff4e03c630cfb371767339231aed768e357a (diff) | |
| download | android_packages_apps_Snap-7da8fbcfe7f132e714663def4f9e7bac9a30a68e.tar.gz android_packages_apps_Snap-7da8fbcfe7f132e714663def4f9e7bac9a30a68e.tar.bz2 android_packages_apps_Snap-7da8fbcfe7f132e714663def4f9e7bac9a30a68e.zip | |
Merge "SnapdragonCamera: Camera switches from bayer and mono on switching to front camera" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 069fb8701..97c4eae0a 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1027,6 +1027,10 @@ public class CameraSettings { return; } + if (numOfCameras > 2 ) { + numOfCameras = 2; + } + CharSequence[] entryValues = new CharSequence[numOfCameras]; for (int i = 0; i < numOfCameras; ++i) { entryValues[i] = "" + i; |