fix Galaxy S detection

diff --git a/AndroidCameraConf.java b/AndroidCameraConf.java
index 242000dc7608f75d34392699bbf29c05ec0fb1c2..523f249b0820e417904be7280a6c43d6c275ad9c 100644 (file)
--- a/AndroidCameraConf.java
+++ b/AndroidCameraConf.java
@@ -25,13 +25,13 @@ import android.util.Log;
 public class AndroidCameraConf {
        private static final String tag = "Linphone";
 
-       public void findFrontAndRearCameraIds(Integer frontCameraId, Integer rearCameraId, Integer cameraId) {
-
+       public void findFrontAndRearCameraIds(int[] frontCameraId, int[] rearCameraId, int[] cameraId) {
+               Log.i(tag, "Detecting cameras");
                if (Hacks.isGalaxyS()) {
                        Log.d(tag, "Hack Galaxy S : has 2 cameras front=2; rear=1");
-                       frontCameraId = 2;
-                       rearCameraId = 1;
-                       cameraId = rearCameraId;
+                       frontCameraId[0] = 2;
+                       rearCameraId[0] = 1;
+                       cameraId[0] = rearCameraId[0];
                        return;
                }
 

diff --git a/AndroidCameraRecordManager.java b/AndroidCameraRecordManager.java
index ffdcc3eeae5045b123234818e2cf55329934b46c..2ca3d70aad36b14ae68cd34f67f9603ca3c8a671 100644 (file)
--- a/AndroidCameraRecordManager.java
+++ b/AndroidCameraRecordManager.java
@@ -69,9 +69,9 @@ public class AndroidCameraRecordManager {
        private AndroidCameraRecordManager() {
                cc = Version.sdkAbove(9) ? new AndroidCameraConf9() : new AndroidCameraConf();
 
-               Integer fId = -1;Integer rId = -1;Integer cId = -1;
+               int[] fId = {-1};int[] rId = {-1};int[] cId = {-1};
                cc.findFrontAndRearCameraIds(fId, rId, cId);
-               frontCameraId=fId;rearCameraId=rId;cameraId=cId;
+               frontCameraId=fId[0];rearCameraId=rId[0];cameraId=cId[0];
        }