5 files changed, 30 insertions, 30 deletions
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
index 02dbbba..407a08a 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCameraManager.java
@@ -66,7 +66,7 @@ public class BlockingCameraManager {
 
         /**
          * Returns the error code {@link ERROR_DISCONNECTED} if disconnected, or one of
-         * {@code CameraDevice.StateListener#ERROR_*} if there was another error.
+         * {@code CameraDevice.StateCallback#ERROR_*} if there was another error.
          *
          * @return int Disconnect/error code
          */
@@ -81,7 +81,7 @@ public class BlockingCameraManager {
          * @param errorCode
          * @param message
          *
-         * @see {@link CameraDevice.StateListener#ERROR_CAMERA_DEVICE}
+         * @see {@link CameraDevice.StateCallback#ERROR_CAMERA_DEVICE}
          */
         public BlockingOpenException(int errorCode, String message) {
             super(message);
@@ -117,8 +117,8 @@ public class BlockingCameraManager {
      * does.</p>
      *
      * <p>Throws {@link BlockingOpenException} when the open fails asynchronously (due to
-     * {@link CameraDevice.StateListener#onDisconnected(CameraDevice)} or
-     * ({@link CameraDevice.StateListener#onError(CameraDevice)}.</p>
+     * {@link CameraDevice.StateCallback#onDisconnected(CameraDevice)} or
+     * ({@link CameraDevice.StateCallback#onError(CameraDevice)}.</p>
      *
      * <p>Throws {@link TimeoutRuntimeException} if opening times out. This is usually
      * highly unrecoverable, and all future calls to opening that camera will fail since the
@@ -142,7 +142,7 @@ public class BlockingCameraManager {
      * @throws TimeoutRuntimeException
      *            If opening times out. Typically unrecoverable.
      */
-    public CameraDevice openCamera(String cameraId, CameraDevice.StateListener listener,
+    public CameraDevice openCamera(String cameraId, CameraDevice.StateCallback listener,
             Handler handler) throws CameraAccessException, BlockingOpenException {
 
         if (handler == null) {
@@ -163,17 +163,17 @@ public class BlockingCameraManager {
     /**
      * Block until CameraManager#openCamera finishes with onOpened/onError/onDisconnected
      *
-     * <p>Pass-through all StateListener changes to the proxy.</p>
+     * <p>Pass-through all StateCallback changes to the proxy.</p>
      *
      * <p>Time out after {@link #OPEN_TIME_OUT} and unblock. Clean up camera if it arrives
      * later.</p>
      */
-    private class OpenListener extends CameraDevice.StateListener {
+    private class OpenListener extends CameraDevice.StateCallback {
         private static final int ERROR_UNINITIALIZED = -1;
 
         private final String mCameraId;
 
-        private final CameraDevice.StateListener mProxy;
+        private final CameraDevice.StateCallback mProxy;
 
         private final Object mLock = new Object();
         private final ConditionVariable mDeviceReady = new ConditionVariable();
@@ -187,7 +187,7 @@ public class BlockingCameraManager {
         private boolean mTimedOut = false;
 
         OpenListener(CameraManager manager, String cameraId,
-                CameraDevice.StateListener listener, Handler handler)
+                CameraDevice.StateCallback listener, Handler handler)
                 throws CameraAccessException {
             mCameraId = cameraId;
             mProxy = listener;
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
index eae85d1..f55437f 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureListener.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
@@ -36,7 +36,7 @@ import com.android.ex.camera2.utils.StateWaiter;
  *
  * @see #getStateWaiter
  */
-public class BlockingCaptureListener extends CameraCaptureSession.CaptureListener {
+public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallback {
 
     /**
      * {@link #onCaptureStarted} has been called.
@@ -80,10 +80,10 @@ public class BlockingCaptureListener extends CameraCaptureSession.CaptureListene
             "CAPTURE_SEQUENCE_ABORTED"
     };
 
-    private static final String TAG = "BlockingCaptureListener";
+    private static final String TAG = "BlockingCaptureCallback";
     private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
 
-    private final CameraCaptureSession.CaptureListener mProxy;
+    private final CameraCaptureSession.CaptureCallback mProxy;
 
     private final StateWaiter mStateWaiter = new StateWaiter(sStateNames);
     private final StateChangeListener mStateChangeListener = mStateWaiter.getListener();
@@ -92,7 +92,7 @@ public class BlockingCaptureListener extends CameraCaptureSession.CaptureListene
      * Create a blocking capture listener without forwarding the capture listener invocations
      * to another capture listener.
      */
-    public BlockingCaptureListener() {
+    public BlockingCaptureCallback() {
         mProxy = null;
     }
 
@@ -104,7 +104,7 @@ public class BlockingCaptureListener extends CameraCaptureSession.CaptureListene
      *
      * @throws NullPointerException if {@code listener} was {@code null}
      */
-    public BlockingCaptureListener(CameraCaptureSession.CaptureListener listener) {
+    public BlockingCaptureCallback(CameraCaptureSession.CaptureCallback listener) {
         if (listener == null) {
             throw new NullPointerException("listener must not be null");
         }
@@ -123,8 +123,8 @@ public class BlockingCaptureListener extends CameraCaptureSession.CaptureListene
 
     @Override
     public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
-                                 long timestamp) {
-        if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp);
+                                 long timestamp, long frameNumber) {
+        if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp, frameNumber);
         mStateChangeListener.onStateChanged(CAPTURE_STARTED);
     }
 
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
index 26bb652..e041d27 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionListener.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
@@ -36,11 +36,11 @@ import java.util.concurrent.TimeoutException;
  * <p>Provides a waiter that can be used to block until the next unobserved state of the
  * requested type arrives.</p>
  *
- * <p>Pass-through all StateListener changes to the proxy.</p>
+ * <p>Pass-through all StateCallback changes to the proxy.</p>
  *
  * @see #getStateWaiter
  */
-public class BlockingSessionListener extends CameraCaptureSession.StateListener {
+public class BlockingSessionCallback extends CameraCaptureSession.StateCallback {
     /**
      * Session is configured, ready for captures
      */
@@ -71,10 +71,10 @@ public class BlockingSessionListener extends CameraCaptureSession.StateListener
     /*
      * Private fields
      */
-    private static final String TAG = "BlockingSessionListener";
+    private static final String TAG = "BlockingSessionCallback";
     private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
 
-    private final CameraCaptureSession.StateListener mProxy;
+    private final CameraCaptureSession.StateCallback mProxy;
     private final SessionFuture mSessionFuture = new SessionFuture();
 
     private final StateWaiter mStateWaiter = new StateWaiter(sStateNames);
@@ -92,7 +92,7 @@ public class BlockingSessionListener extends CameraCaptureSession.StateListener
      * Create a blocking session listener without forwarding the session listener invocations
      * to another session listener.
      */
-    public BlockingSessionListener() {
+    public BlockingSessionCallback() {
         mProxy = null;
     }
 
@@ -104,7 +104,7 @@ public class BlockingSessionListener extends CameraCaptureSession.StateListener
      *
      * @throws NullPointerException if {@code listener} was {@code null}
      */
-    public BlockingSessionListener(CameraCaptureSession.StateListener listener) {
+    public BlockingSessionCallback(CameraCaptureSession.StateCallback listener) {
         if (listener == null) {
             throw new NullPointerException("listener must not be null");
         }
@@ -142,7 +142,7 @@ public class BlockingSessionListener extends CameraCaptureSession.StateListener
     }
 
     /*
-     * CameraCaptureSession.StateListener implementation
+     * CameraCaptureSession.StateCallback implementation
      */
 
     @Override
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java
index 02c2ba3..5f93fbc 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateListener.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingStateCallback.java
@@ -36,14 +36,14 @@ import java.util.concurrent.TimeUnit;
  * the last wait, or that will be received from the camera device in the
  * future.</p>
  *
- * <p>Pass-through all StateListener changes to the proxy.</p>
+ * <p>Pass-through all StateCallback changes to the proxy.</p>
  *
  */
-public class BlockingStateListener extends CameraDevice.StateListener {
-    private static final String TAG = "BlockingStateListener";
+public class BlockingStateCallback extends CameraDevice.StateCallback {
+    private static final String TAG = "BlockingStateCallback";
     private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
 
-    private final CameraDevice.StateListener mProxy;
+    private final CameraDevice.StateCallback mProxy;
 
     // Guards mWaiting
     private final Object mLock = new Object();
@@ -99,11 +99,11 @@ public class BlockingStateListener extends CameraDevice.StateListener {
      */
     private static int NUM_STATES = 4;
 
-    public BlockingStateListener() {
+    public BlockingStateCallback() {
         mProxy = null;
     }
 
-    public BlockingStateListener(CameraDevice.StateListener listener) {
+    public BlockingStateCallback(CameraDevice.StateCallback listener) {
         mProxy = listener;
     }
 
diff --git a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
index 9fa2af2..e8a3ab6 100644
--- a/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
+++ b/camera2/public/src/com/android/ex/camera2/pos/AutoFocusStateMachine.java
@@ -91,7 +91,7 @@ public class AutoFocusStateMachine {
 
     /**
      * Invoke every time we get a new CaptureResult via
-     * {@link CameraDevice.CaptureListener#onCaptureCompleted}.
+     * {@link CameraDevice.CaptureCallback#onCaptureCompleted}.
      *
      * <p>This function is responsible for dispatching updates via the
      * {@link AutoFocusStateListener} so without calling this on a regular basis, no