Merge "TestVideoProvider: Update to latest camera2 API" into lmp-dev
diff --git a/tests/src/com/android/telecomm/testapps/TestVideoProvider.java b/tests/src/com/android/telecomm/testapps/TestVideoProvider.java
index 64a64ed..f338101 100644
--- a/tests/src/com/android/telecomm/testapps/TestVideoProvider.java
+++ b/tests/src/com/android/telecomm/testapps/TestVideoProvider.java
@@ -18,7 +18,7 @@
import com.android.ex.camera2.blocking.BlockingCameraManager;
import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
-import com.android.ex.camera2.blocking.BlockingSessionListener;
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
import com.android.telecomm.tests.R;
import android.content.Context;
@@ -253,7 +253,7 @@
surfaces.add(mPreviewSurface);
CaptureRequest.Builder mCaptureRequest = null;
try {
- BlockingSessionListener blkSession = new BlockingSessionListener();
+ BlockingSessionCallback blkSession = new BlockingSessionCallback();
mCameraDevice.createCaptureSession(surfaces, blkSession, mHandler);
mCaptureRequest = mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
mCaptureRequest.addTarget(mPreviewSurface);
@@ -265,7 +265,7 @@
// Keep repeating
try {
- mCameraSession.setRepeatingRequest(mCaptureRequest.build(), new CameraCaptureListener(),
+ mCameraSession.setRepeatingRequest(mCaptureRequest.build(), new CameraCaptureCallback(),
mHandler);
} catch (CameraAccessException e) {
log("CameraAccessException: " + e);
@@ -294,7 +294,7 @@
/**
* Required listener for camera capture events.
*/
- private class CameraCaptureListener extends CameraCaptureSession.CaptureListener {
+ private class CameraCaptureCallback extends CameraCaptureSession.CaptureCallback {
@Override
public void onCaptureCompleted(CameraCaptureSession camera, CaptureRequest request,
TotalCaptureResult result) {