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-25565] Android: Prevent auto-focus callback from taking multiple pictures #9637

Merged
merged 8 commits into from
Jan 24, 2018
Merged

[TIMOB-25565] Android: Prevent auto-focus callback from taking multiple pictures #9637

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05aa34f
[TIMOB-25565] Prevent auto-focus callback from taking multiple pictures
Nov 29, 2017
e2b0467
Merge branch 'master' into TIMOB-25565
longton95 Dec 11, 2017
a3bd828
Merge branch 'master' into TIMOB-25565
longton95 Dec 15, 2017
00b2dfd
Merge branch 'master' into TIMOB-25565
ssjsamir Dec 20, 2017
db61110
Merge branch 'master' into TIMOB-25565
ssjsamir Dec 20, 2017
658b49e
Merge branch 'master' into TIMOB-25565
ssjsamir Dec 27, 2017
1bb25df
Merge branch 'master' into TIMOB-25565
Jan 16, 2018
f8b2783
Merge branch 'master' into TIMOB-25565
eric34 Jan 24, 2018
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
19 changes: 11 additions & 8 deletions android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,21 +715,24 @@ static public void takePicture()
AutoFocusCallback focusCallback = new AutoFocusCallback() {
public void onAutoFocus(boolean success, Camera camera)
{
try {
camera.takePicture(shutterCallback, null, jpegCallback);
} catch (Exception e) {
Log.w(TAG, "could not take picture: " + e.toString());
takingPicture = false;
}
if (!success) {
Log.w(TAG, "Unable to focus.");
if (takingPicture) {
try {
camera.takePicture(shutterCallback, null, jpegCallback);
} catch (Exception e) {
Log.w(TAG, "could not take picture: " + e.toString());
takingPicture = false;
}
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(null);
}
};
camera.autoFocus(focusCallback);
Expand Down