From db3a4ffa8af8147a14ca9bc98bd8580bc1f75292 Mon Sep 17 00:00:00 2001
From: zouxf <service@t-firefly.com>
Date: Fri, 29 Jan 2016 17:11:27 +0800
Subject: [PATCH] Android->CameraHal:fix usb camera fail when TC358749
 connected

---
 .../camera/CameraHal/CameraHal_Module.cpp     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp b/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp
index b43c3f10b6..7e466dc3d6 100755
--- a/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp
+++ b/hardware/rockchip/camera/CameraHal/CameraHal_Module.cpp
@@ -1058,7 +1058,22 @@ int camera_get_number_of_cameras(void)
         }
    	}
 
-   
+    if (cam_cnt > 1) {
+        int i;
+        char* sensorName;
+        rk_cam_info_t camInfoSwap;
+        for(i=0; i<cam_cnt-1; i++) {
+            sensorName = camInfoTmp[i].pcam_total_info->mHardInfo.mSensorInfo.mSensorName;
+            if ( 0 == strcmp(sensorName,"TC358749XBG")) {
+                LOGD("swap %s ",sensorName);
+                memcpy(&camInfoSwap, &camInfoTmp[i], sizeof(rk_cam_info_t));
+                memcpy(&camInfoTmp[i], &camInfoTmp[cam_cnt-1], sizeof(rk_cam_info_t));
+                memcpy(&camInfoTmp[cam_cnt-1], &camInfoSwap, sizeof(rk_cam_info_t));
+                break;
+            }
+        }
+    }
+
 	camera_board_profiles::ProduceNewXml(profiles);
 	
     gCamerasNumber = cam_cnt;
@@ -1098,7 +1113,8 @@ int camera_get_number_of_cameras(void)
         camInfoTmp[1].facing_info.facing = CAMERA_FACING_BACK;
     }
     #endif
-    
+
+
     for (i=0; i<CAMERAS_SUPPORT_MAX; i++)
         memcpy(&gCamInfos[i], &camInfoTmp[i], sizeof(rk_cam_info_t));