diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-20 18:48:23 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-09-20 18:48:23 -0700 |
| commit | dc82bfc6ce14c4989518c2ca49a0f6067768388d (patch) | |
| tree | a8122aec5a4f025ced63903cd1f1bb8a4ccc938d | |
| parent | 0c8bea0ecff2dd99f2abae5149cd07ca4e642e9a (diff) | |
| download | pdk-dc82bfc6ce14c4989518c2ca49a0f6067768388d.tar.gz | |
TestingCamera2/ItsService: Update onCaptureFailed adding new CaptureFailure argument
Bug: 10360518
Change-Id: I472da858f2a2fc42bd98bbc305ed419062027f38
| -rw-r--r-- | apps/CameraITS/service/src/com/android/camera2/its/ItsService.java | 4 | ||||
| -rw-r--r-- | apps/TestingCamera2/src/com/android/testingcamera2/TestingCamera2.java | 4 |
2 files changed, 6 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 0054c76..8c0817f 100644 --- a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java +++ b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java @@ -24,6 +24,7 @@ import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraManager; import android.hardware.camera2.CameraProperties; +import android.hardware.camera2.CaptureFailure; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; import android.hardware.camera2.Rational; @@ -692,7 +693,8 @@ public class ItsService extends Service { } @Override - public void onCaptureFailed(CameraDevice camera, CaptureRequest request) { + public void onCaptureFailed(CameraDevice camera, CaptureRequest request, + CaptureFailure failure) { mCaptureCallbackLatch.countDown(); Log.e(TAG, "Script error: capture failed"); Log.e(PYTAG, "### FAIL"); diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/TestingCamera2.java b/apps/TestingCamera2/src/com/android/testingcamera2/TestingCamera2.java index 596dd28..ddd566e 100644 --- a/apps/TestingCamera2/src/com/android/testingcamera2/TestingCamera2.java +++ b/apps/TestingCamera2/src/com/android/testingcamera2/TestingCamera2.java @@ -22,6 +22,7 @@ import android.graphics.BitmapFactory; import android.graphics.ImageFormat; import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraProperties; +import android.hardware.camera2.CaptureFailure; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; import android.media.Image; @@ -283,7 +284,8 @@ public class TestingCamera2 extends Activity implements SurfaceHolder.Callback { } @Override - public void onCaptureFailed(CameraDevice camera, CaptureRequest request) { + public void onCaptureFailed(CameraDevice camera, CaptureRequest request, + CaptureFailure failure) { Log.e(TAG, "Capture failed"); } }; |