commit 76215c98a9a11d87b5ce9d2b4198654c2b8bbddf
author Alan Newberger <alann@google.com> Mon Sep 08 11:26:27 2014 -0700
committer Alan Newberger <alann@google.com> Mon Sep 08 11:52:14 2014 -0700
tree a5991345d35930fb906a315be3af97fce444b93e
parent 954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14

DO NOT MERGE Update Camera2 to use latest APIs

Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e

src/com/android/camera/one/v2/ImageCaptureManager.java

diff --git a/src/com/android/camera/one/v2/ImageCaptureManager.java b/src/com/android/camera/one/v2/ImageCaptureManager.java
index 464cb1e..a815345 100644
--- a/src/com/android/camera/one/v2/ImageCaptureManager.java
+++ b/src/com/android/camera/one/v2/ImageCaptureManager.java
@@ -56,7 +56,7 @@
  * they are passed in from the lower-level camera2 API.
  */
 @TargetApi(Build.VERSION_CODES.L)
-public class ImageCaptureManager extends CameraCaptureSession.CaptureListener implements
+public class ImageCaptureManager extends CameraCaptureSession.CaptureCallback implements
         ImageReader.OnImageAvailableListener {
     /**
      * Callback to listen for changes to the ability to capture an existing

src/com/android/camera/one/v2/OneCameraImpl.java

diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index 3f7e461..16a027f 100644
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -153,8 +153,8 @@
     /**
      * Common listener for preview frame metadata.
      */
-    private final CameraCaptureSession.CaptureListener mAutoFocusStateListener = new
-            CameraCaptureSession.CaptureListener() {
+    private final CameraCaptureSession.CaptureCallback mAutoFocusStateListener = new
+            CameraCaptureSession.CaptureCallback() {
                 @Override
                 public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
                                              long timestamp) {
@@ -474,7 +474,7 @@
             outputSurfaces.add(previewSurface);
             outputSurfaces.add(mCaptureImageReader.getSurface());
 
-            mDevice.createCaptureSession(outputSurfaces, new CameraCaptureSession.StateListener() {
+            mDevice.createCaptureSession(outputSurfaces, new CameraCaptureSession.StateCallback() {
 
                 @Override
                 public void onConfigureFailed(CameraCaptureSession session) {

src/com/android/camera/one/v2/OneCameraManagerImpl.java

diff --git a/src/com/android/camera/one/v2/OneCameraManagerImpl.java b/src/com/android/camera/one/v2/OneCameraManagerImpl.java
index 48b3fcf..0f22477 100644
--- a/src/com/android/camera/one/v2/OneCameraManagerImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraManagerImpl.java
@@ -66,7 +66,7 @@
         try {
             final String cameraId = getCameraId(facing);
             Log.i(TAG, "Opening Camera ID " + cameraId);
-            mCameraManager.openCamera(cameraId, new CameraDevice.StateListener() {
+            mCameraManager.openCamera(cameraId, new CameraDevice.StateCallback() {
 
                 @Override
                 public void onDisconnected(CameraDevice device) {

src/com/android/camera/one/v2/OneCameraZslImpl.java

diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index 874ace4..ca3f9f3 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -644,7 +644,7 @@
             outputSurfaces.add(previewSurface);
             outputSurfaces.add(mCaptureImageReader.getSurface());
 
-            mDevice.createCaptureSession(outputSurfaces, new CameraCaptureSession.StateListener() {
+            mDevice.createCaptureSession(outputSurfaces, new CameraCaptureSession.StateCallback() {
                     @Override
                 public void onConfigureFailed(CameraCaptureSession session) {
                     listener.onSetupFailed();