summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-02-10 11:47:29 -0800
committerJay Wang <jaywang@codeaurora.org>2016-03-30 15:54:49 -0700
commit1b30b78434547a368de2a918476e749db8dad96c (patch)
tree1598bd5094425c582ebd9da4f5a8e3d8a2d9d16c /src/com/android/camera/CameraActivity.java
parent3618eb79912c36216b197580e54e366ab19d2a61 (diff)
downloadandroid_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.gz
android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.bz2
android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.zip
SnapdragonCamera: Camera2 add dual camera
Add Camera2 dual camera support to SnapdragonCamera CRs-Fixed: 989750 Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 80387a946..7315f4d80 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1813,7 +1813,9 @@ public class CameraActivity extends Activity
public void onModuleSelected(int moduleIndex) {
if (moduleIndex == 0 && CAMERA_2_ON) moduleIndex = ModuleSwitcher.CAPTURE_MODULE_INDEX;
if (mCurrentModuleIndex == moduleIndex) {
- return;
+ if (mCurrentModuleIndex != ModuleSwitcher.CAPTURE_MODULE_INDEX) {
+ return;
+ }
}
CameraHolder.instance().keep();
closeModule(mCurrentModule);