diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-09 22:21:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 22:21:05 +0000 |
| commit | 06b23bb5cbddfed587a6f0d75636734862b49a1e (patch) | |
| tree | d670720c6d19d044152c8e905921db9b14ad07d4 /camera2/portability/src | |
| parent | 9f57c438ea0c7f02d0e86ade6a5e36c8993dd9fc (diff) | |
| parent | 171362f843c1e7623f29db1781176f85b1f74815 (diff) | |
| download | android_frameworks_ex-06b23bb5cbddfed587a6f0d75636734862b49a1e.tar.gz android_frameworks_ex-06b23bb5cbddfed587a6f0d75636734862b49a1e.tar.bz2 android_frameworks_ex-06b23bb5cbddfed587a6f0d75636734862b49a1e.zip | |
Merge "Camera2: Update for camera2 API changes" into lmp-dev
Diffstat (limited to 'camera2/portability/src')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java index ce9a8b8..a746634 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -1099,7 +1099,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { new CaptureAvailableListener() { @Override public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, - long timestamp) { + long timestamp, long frameNumber) { if (shutter != null) { handler.post(new Runnable() { @Override |