diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-25 14:48:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-25 14:48:02 -0700 |
| commit | 22bd9b8fba0f10c4d07bbf2f4e9dc21035973798 (patch) | |
| tree | 5ed70b295e6dcfac8402a07f40621f15dde4184d /src/com/android | |
| parent | 15d67ac6790b0c3934f7f669d48e827d83c918c9 (diff) | |
| parent | 66d444cce1c1315996bfa2f62e0ccded3931afa1 (diff) | |
| download | android_packages_apps_Snap-22bd9b8fba0f10c4d07bbf2f4e9dc21035973798.tar.gz android_packages_apps_Snap-22bd9b8fba0f10c4d07bbf2f4e9dc21035973798.tar.bz2 android_packages_apps_Snap-22bd9b8fba0f10c4d07bbf2f4e9dc21035973798.zip | |
Merge "SnapdragonCamera: Close aux camera first when shutting down" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index c39b0c131..bfdba9e86 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1460,7 +1460,8 @@ public class CaptureModule implements CameraModule, PhotoController, mFrameProcessor.onClose(); } - for (int i = 0; i < MAX_NUM_CAM; i++) { + // Close camera starting with AUX first + for (int i = MAX_NUM_CAM-1; i >= 0; i--) { if (null != mCaptureSession[i]) { if (mIsLinked && mCamerasOpened) { unLinkBayerMono(i); @@ -1489,7 +1490,8 @@ public class CaptureModule implements CameraModule, PhotoController, try { mCameraOpenCloseLock.acquire(); - for (int i = 0; i < MAX_NUM_CAM; i++) { + // Close camera starting with AUX first + for (int i = MAX_NUM_CAM-1; i >= 0; i--) { if (null != mCameraDevice[i]) { mCameraDevice[i].close(); mCameraDevice[i] = null; |