bluewallet/react-native-camera
bluewallet/react-native-camera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(android): Fix camera parameters getting lost on setting focus. (#2946)

Browse Source 
* Fix camera parameters getting lost on setting focus.

* merge error

Co-authored-by: Cristiano Coelho <cristianocca@hotmail.com>
This commit is contained in:
cristianoccazinsp 2020-08-21 08:18:55 -03:00 committed by GitHub
parent 628c4162e1
commit 47637774a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
android/src/main/java/com/google/android/cameraview/Camera1.java
View File

@ -1189,17 +1189,9 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
public void run() {
synchronized(Camera1.this){
if (mCamera != null) {
Camera.Parameters parameters = null;
// This might crash on some devices if the camera is not
// available/locked, with a RuntimeException("getParameters failed (empty parameters)")
try{
parameters = mCamera.getParameters();
}
catch(Exception e){
Log.e("CAMERA_1::", "setFocusArea.getParameters failed", e);
parameters = null;
}
// do not create a new object, use existing.
Camera.Parameters parameters = mCameraParameters;
if (parameters == null) return;
@ -1294,14 +1286,9 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
if (mCamera != null) {
mCamera.cancelAutoFocus();
Camera.Parameters parameters = null;
try{
parameters = mCamera.getParameters();
}
catch(Exception e){
Log.e("CAMERA_1::", "resetFocus.getParameters failed", e);
parameters = null;
}
// do not create a new object, use existing.
Camera.Parameters parameters = mCameraParameters;
if (parameters == null) return;
if (parameters.getFocusMode() != Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE) {