fix lg g3 start

fkeglevich · Nov 19, 2017 · 3f3dbdd · 3f3dbdd
1 parent 7d88989
commit 3f3dbdd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/app/src/main/java/freed/cam/apis/basecamera/CameraFragmentAbstract.java b/app/src/main/java/freed/cam/apis/basecamera/CameraFragmentAbstract.java
@@ -164,7 +164,8 @@ public void setCameraStateChangedListner(final CameraStateEvents cameraChangedLi
 
     @Override
     public void startCamera() {
-        mBackgroundHandler.sendMessage(mBackgroundHandler.obtainMessage(MSG_START_CAMERA));
+        cameraHolder.OpenCamera(getAppSettingsManager().GetCurrentCamera());
+        //mBackgroundHandler.sendMessage(mBackgroundHandler.obtainMessage(MSG_START_CAMERA));
     }
 
     @Override

diff --git a/app/src/main/java/freed/cam/apis/camera1/CameraHolder.java b/app/src/main/java/freed/cam/apis/camera1/CameraHolder.java
@@ -92,12 +92,20 @@ public boolean OpenCamera(int camera)
         {
             Log.d(TAG, "open camera");
             mCamera = Camera.open(camera);
+            mCamera.setErrorCallback(new Camera.ErrorCallback() {
+                @Override
+                public void onError(int error, Camera camera) {
+                    Log.e(TAG, "Error:" + error);
+                }
+            });
             isRdy = true;
             cameraUiWrapper.onCameraOpen("");
 
         } catch (Exception ex) {
             isRdy = false;
             Log.WriteEx(ex);
+            if (mCamera != null)
+                mCamera.release();
         }
         return isRdy;
     }
@@ -261,6 +269,11 @@ public void ResetPreviewCallback()
         {
             Log.e(TAG,ex.getMessage());
         }
+        catch (RuntimeException ex)
+        {
+            Log.d(TAG, "Camera was released");
+            Log.WriteEx(ex);
+        }
 
     }
 

diff --git a/app/src/main/java/freed/cam/apis/camera1/cameraholder/CameraHolderLG.java b/app/src/main/java/freed/cam/apis/camera1/cameraholder/CameraHolderLG.java
@@ -30,16 +30,16 @@
  */
 public class CameraHolderLG extends CameraHolder
 {
+    private LGCamera lgCamera;
     public CameraHolderLG(CameraWrapperInterface cameraUiWrapper, Frameworks frameworks) {
         super(cameraUiWrapper,frameworks);
     }
 
     @Override
     public boolean OpenCamera(int camera)
     {
-
         try {
-            LGCamera lgCamera;
+
             if (appSettingsManager.opencamera1Legacy.getBoolean()) {
                 lgCamera = new LGCamera(camera, 256);
                 Log.d(CameraHolderLG.class.getSimpleName(), "open LG camera legacy");