diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-08-19 16:41:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-27 11:15:12 -0700 |
| commit | 638172e20dcad32ca3d79b599eb6054c3acd5443 (patch) | |
| tree | 412f565289cb321e304c93142b5a98a4148447b6 /src/com/android/camera/CaptureModule.java | |
| parent | 37daaf4ddddd0558f227be4cbd8a0a0d34cccf18 (diff) | |
| download | android_packages_apps_Snap-638172e20dcad32ca3d79b599eb6054c3acd5443.tar.gz android_packages_apps_Snap-638172e20dcad32ca3d79b599eb6054c3acd5443.tar.bz2 android_packages_apps_Snap-638172e20dcad32ca3d79b599eb6054c3acd5443.zip | |
SnapdragonCamera: Close aux camera first when shutting down
Close the mono camera first when shutting down cameras.
CRs-Fixed: 1054456
Change-Id: I6e58f5b0e6263e4234d0278eb20c68ef01f02bc5
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -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 82b8e9b94..f1fd71a11 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; |