diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-09 22:21:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 22:21:11 +0000 |
| commit | 7e97f8dc5b38c86be65c7d5a97ca5a8e2132137e (patch) | |
| tree | 759ce6cb8765733509620fe5cb549f358fe6b04e /apps | |
| parent | 62cdc3aba3b38d410193c42166958d7871fbef9c (diff) | |
| parent | aba26d0b61ece36e969dae46bd4302c5e48a4cdd (diff) | |
| download | pdk-7e97f8dc5b38c86be65c7d5a97ca5a8e2132137e.tar.gz | |
Merge "CameraITS, TestingCamera2: Update for API changes" into lmp-dev
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CameraITS/service/src/com/android/camera2/its/ItsService.java | 3 | ||||
| -rw-r--r-- | apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java index 94f5218..9c196ca 100644 --- a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java +++ b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java @@ -1078,7 +1078,8 @@ public class ItsService extends Service implements SensorEventListener { private final CaptureResultListener mCaptureResultListener = new CaptureResultListener() { @Override - public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, long timestamp) { + public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, + long timestamp, long frameNumber) { } @Override diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java index afaa710..64fa8a4 100644 --- a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java +++ b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java @@ -390,7 +390,7 @@ public class TestingCamera2 extends Activity implements SurfaceHolder.Callback { @Override public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request, - long timestamp) { + long timestamp, long frameNumber) { } @Override |