LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samples: Sync prebuilts for nyc-dev

Browse Source 
developers/samples/android: f9872ded3bb6cd3c01ab0881a58764f5171b4c64
developers/build: 23e77f8a040c0b35531a68e776363f32fa7feeeb

Change-Id: I93e7c66e0cff22d3852d36a1a1257bb10eec3ba0
This commit is contained in:
Trevor Johns
2016-06-15 10:57:45 -07:00
parent 17be9b742a
commit 5a6b719823
140 changed files with 4432 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/browseable/Camera2Raw/src/com.example.android.camera2raw/Camera2RawFragment.java
View File

@@ -442,7 +442,10 @@ public class Camera2RawFragment extends Fragment
case STATE_WAITING_FOR_3A_CONVERGENCE: {
boolean readyToCapture = true;
if (!mNoAFRun) {
int afState = result.get(CaptureResult.CONTROL_AF_STATE);
Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
if (afState == null) {
break;
}
// If auto-focus has reached locked state, we are ready to capture
readyToCapture =
@@ -454,8 +457,11 @@ public class Camera2RawFragment extends Fragment
// auto-exposure and auto-white-balance have converged as well before
// taking a picture.
if (!isLegacyLocked()) {
int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
int awbState = result.get(CaptureResult.CONTROL_AWB_STATE);
Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
Integer awbState = result.get(CaptureResult.CONTROL_AWB_STATE);
if (aeState == null || awbState == null) {
break;
}
readyToCapture = readyToCapture &&
aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED &&