diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-12-09 18:47:59 -0800 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-12-09 18:49:04 -0800 |
| commit | abededd8f7014bb4af9e0e203b71633cd72e9c20 (patch) | |
| tree | b895cb281d829774fea1bd4089729359287f428a /samples/browseable/Camera2Basic/src | |
| parent | 1ccf8350d52bd8d7f480c2c4d46c666356f4a220 (diff) | |
| download | android_development-abededd8f7014bb4af9e0e203b71633cd72e9c20.tar.gz android_development-abededd8f7014bb4af9e0e203b71633cd72e9c20.tar.bz2 android_development-abededd8f7014bb4af9e0e203b71633cd72e9c20.zip | |
Docs: Sync browseable samples for lmp-docs
Synced to developers/samples/android commit
bc036ecdf44cd03163c206096172299f3940b057.
Change-Id: Ib68230d79ca300e7db906aff2ebfc2cb6c6968f7
Diffstat (limited to 'samples/browseable/Camera2Basic/src')
| -rw-r--r-- | samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java b/samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java index f4bf2207c..4b5535859 100644 --- a/samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java +++ b/samples/browseable/Camera2Basic/src/com.example.android.camera2basic/Camera2BasicFragment.java @@ -266,8 +266,10 @@ public class Camera2BasicFragment extends Fragment implements View.OnClickListen int afState = result.get(CaptureResult.CONTROL_AF_STATE); if (CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED == afState || CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED == afState) { - int aeState = result.get(CaptureResult.CONTROL_AE_STATE); - if (aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) { + // CONTROL_AE_STATE can be null on some devices + Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE); + if (aeState == null || + aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) { mState = STATE_WAITING_NON_PRECAPTURE; captureStillPicture(); } else { @@ -277,17 +279,19 @@ public class Camera2BasicFragment extends Fragment implements View.OnClickListen break; } case STATE_WAITING_PRECAPTURE: { - int aeState = result.get(CaptureResult.CONTROL_AE_STATE); - if (CaptureResult.CONTROL_AE_STATE_PRECAPTURE == aeState) { - mState = STATE_WAITING_NON_PRECAPTURE; - } else if (CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED == aeState) { + // CONTROL_AE_STATE can be null on some devices + Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE); + if (aeState == null || + aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE || + aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) { mState = STATE_WAITING_NON_PRECAPTURE; } break; } case STATE_WAITING_NON_PRECAPTURE: { - int aeState = result.get(CaptureResult.CONTROL_AE_STATE); - if (CaptureResult.CONTROL_AE_STATE_PRECAPTURE != aeState) { + // CONTROL_AE_STATE can be null on some devices + Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE); + if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) { mState = STATE_PICTURE_TAKEN; captureStillPicture(); } |