Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-20260] Android: Android M Camera Overlay crash fix #7679

Merged
merged 2 commits into from Feb 4, 2016
Merged

[TIMOB-20260] Android: Android M Camera Overlay crash fix #7679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf832c
[TIMOB-20260] Android: Android M Camera Overlay crash fix
Feb 4, 2016
a75e364
[TIMOB-20260] Added comments
Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 31 additions & 18 deletions android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@
import android.hardware.Camera.ShutterCallback;
import android.hardware.Camera.Size;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.view.Gravity;
Expand Down Expand Up @@ -495,24 +496,36 @@ private static File writeToFile(byte[] data, boolean saveToGallery) throws Throw

static public void takePicture()
{
String focusMode = camera.getParameters().getFocusMode();
if (!(focusMode.equals(Parameters.FOCUS_MODE_EDOF) || focusMode.equals(Parameters.FOCUS_MODE_FIXED) || focusMode
.equals(Parameters.FOCUS_MODE_INFINITY))) {
AutoFocusCallback focusCallback = new AutoFocusCallback()
{
public void onAutoFocus(boolean success, Camera camera)
{
camera.takePicture(shutterCallback, null, jpegCallback);
if (!success) {
Log.w(TAG, "Unable to focus.");
}
camera.cancelAutoFocus();
}
};
camera.autoFocus(focusCallback);
} else {
camera.takePicture(shutterCallback, null, jpegCallback);
}
try {
String focusMode = camera.getParameters().getFocusMode();
if (!(focusMode.equals(Parameters.FOCUS_MODE_EDOF)
|| focusMode.equals(Parameters.FOCUS_MODE_FIXED) || focusMode
.equals(Parameters.FOCUS_MODE_INFINITY))) {
AutoFocusCallback focusCallback = new AutoFocusCallback()
{
public void onAutoFocus(boolean success, Camera camera)
{
camera.takePicture(shutterCallback, null, jpegCallback);
if (!success) {
Log.w(TAG, "Unable to focus.");
}
// This is a Hotfix for TIMOB-20260
// "cancelAutoFocus" causes the camera to crash on M (probably due to discontinued support of android.hardware.camera)
// We need to move to android.hardware.camera2 APIs as soon as we can.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
camera.cancelAutoFocus();
}
}
};
camera.autoFocus(focusCallback);
} else {
camera.takePicture(shutterCallback, null, jpegCallback);
}
} catch (Exception e) {
if (camera != null) {
camera.release();
}
}
}

public boolean isPreviewRunning()
Expand Down