summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-12 14:59:17 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-12 14:59:17 -0800
commiteb5bc6a5dd4b9eb346d4e24b191d8090163786d7 (patch)
tree453793570001ff8add854699f25fe841a16a560d /src
parentee7f2e809fb7052b0cc08ecd3a31178785bfc669 (diff)
parent7ccbf7c3f5414be81b9f1db502556578b57ff0e3 (diff)
downloadandroid_packages_apps_Snap-eb5bc6a5dd4b9eb346d4e24b191d8090163786d7.tar.gz
android_packages_apps_Snap-eb5bc6a5dd4b9eb346d4e24b191d8090163786d7.tar.bz2
android_packages_apps_Snap-eb5bc6a5dd4b9eb346d4e24b191d8090163786d7.zip
Merge "SnapdragonCamera: revert CR1088821 Revert "SnapdragonCamera: Camera switches from bayer and mono on switching to front camera" CR1088821 issue only fix in C7, revet on mainline" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraSettings.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 97c4eae0a..069fb8701 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -1027,10 +1027,6 @@ public class CameraSettings {
return;
}
- if (numOfCameras > 2 ) {
- numOfCameras = 2;
- }
-
CharSequence[] entryValues = new CharSequence[numOfCameras];
for (int i = 0; i < numOfCameras; ++i) {
entryValues[i] = "" + i;