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;