DO NOT MERGE: Adjust for camera2 API changes

Add frameNumber to CaptureCallback#onCaptureStarted

Bug: 17421092
Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
(cherry picked from commit dd38b94c6f21b528f0de706a69d853f24a9c9561)

diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index e27755d..e1f3469 100644 (file)
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -157,7 +157,7 @@ public class OneCameraImpl extends AbstractOneCamera {
             CameraCaptureSession.CaptureCallback() {
                 @Override
                 public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
-                                             long timestamp) {
+                                             long timestamp, long frameNumber) {
                     if (request.getTag() == RequestTag.CAPTURE && mLastPictureCallback != null) {
                         mLastPictureCallback.onQuickExpose();
                     }