3 files changed, 37 insertions, 22 deletions
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
index 35b1c6d..e6988b5 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerForwarder.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
@@ -17,7 +17,7 @@
 package com.android.ex.camera2.utils;
 
 import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCaptureSession.CaptureListener;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
@@ -25,14 +25,14 @@ import android.hardware.camera2.TotalCaptureResult;
 import android.os.Handler;
 
 /**
- * Proxy that forwards all updates to another {@link CaptureListener}, invoking
+ * Proxy that forwards all updates to another {@link CaptureCallback}, invoking
  * its callbacks on a separate {@link Handler}.
  */
-public class Camera2CaptureListenerForwarder extends CaptureListener {
-    private CaptureListener mListener;
+public class Camera2CaptureCallbackForwarder extends CaptureCallback {
+    private CaptureCallback mListener;
     private Handler mHandler;
 
-    public Camera2CaptureListenerForwarder(CaptureListener listener, Handler handler) {
+    public Camera2CaptureCallbackForwarder(CaptureCallback listener, Handler handler) {
         mListener = listener;
         mHandler = handler;
     }
@@ -89,11 +89,11 @@ public class Camera2CaptureListenerForwarder extends CaptureListener {
 
     @Override
     public void onCaptureStarted(final CameraCaptureSession session, final CaptureRequest request,
-                                 final long timestamp) {
+                                 final long timestamp, final long frameNumber) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
-                mListener.onCaptureStarted(session, request, timestamp);
+                mListener.onCaptureStarted(session, request, timestamp, frameNumber);
             }});
     }
 }
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
index a13dc04..86c6070 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureListenerSplitter.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
@@ -17,7 +17,7 @@
 package com.android.ex.camera2.utils;
 
 import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCaptureSession.CaptureListener;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
@@ -28,18 +28,18 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * Junction that allows notifying multiple {@link CaptureListener}s whenever
+ * Junction that allows notifying multiple {@link CaptureCallback}s whenever
  * the {@link CameraCaptureSession} posts a capture-related update.
  */
-public class Camera2CaptureListenerSplitter extends CaptureListener {
-    private final List<CaptureListener> mRecipients = new LinkedList<>();
+public class Camera2CaptureCallbackSplitter extends CaptureCallback {
+    private final List<CaptureCallback> mRecipients = new LinkedList<>();
 
     /**
      * @param recipients The listeners to notify. Any {@code null} passed here
      *                   will be completely ignored.
      */
-    public Camera2CaptureListenerSplitter(CaptureListener... recipients) {
-        for (CaptureListener listener : recipients) {
+    public Camera2CaptureCallbackSplitter(CaptureCallback... recipients) {
+        for (CaptureCallback listener : recipients) {
             if (listener != null) {
                 mRecipients.add(listener);
             }
@@ -49,7 +49,7 @@ public class Camera2CaptureListenerSplitter extends CaptureListener {
     @Override
     public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
                                    TotalCaptureResult result) {
-        for (CaptureListener target : mRecipients) {
+        for (CaptureCallback target : mRecipients) {
             target.onCaptureCompleted(session, request, result);
         }
     }
@@ -57,7 +57,7 @@ public class Camera2CaptureListenerSplitter extends CaptureListener {
     @Override
     public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request,
                                 CaptureFailure failure) {
-        for (CaptureListener target : mRecipients) {
+        for (CaptureCallback target : mRecipients) {
             target.onCaptureFailed(session, request, failure);
         }
     }
@@ -65,14 +65,14 @@ public class Camera2CaptureListenerSplitter extends CaptureListener {
     @Override
     public void onCaptureProgressed(CameraCaptureSession session, CaptureRequest request,
                                     CaptureResult partialResult) {
-        for (CaptureListener target : mRecipients) {
+        for (CaptureCallback target : mRecipients) {
             target.onCaptureProgressed(session, request, partialResult);
         }
     }
 
     @Override
     public void onCaptureSequenceAborted(CameraCaptureSession session, int sequenceId) {
-        for (CaptureListener target : mRecipients) {
+        for (CaptureCallback target : mRecipients) {
             target.onCaptureSequenceAborted(session, sequenceId);
         }
     }
@@ -80,16 +80,16 @@ public class Camera2CaptureListenerSplitter extends CaptureListener {
     @Override
     public void onCaptureSequenceCompleted(CameraCaptureSession session, int sequenceId,
                                            long frameNumber) {
-        for (CaptureListener target : mRecipients) {
+        for (CaptureCallback target : mRecipients) {
             target.onCaptureSequenceCompleted(session, sequenceId, frameNumber);
         }
     }
 
     @Override
     public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
-                                 long timestamp) {
-        for (CaptureListener target : mRecipients) {
-            target.onCaptureStarted(session, request, timestamp);
+                                 long timestamp, long frameNumber) {
+        for (CaptureCallback target : mRecipients) {
+            target.onCaptureStarted(session, request, timestamp, frameNumber);
         }
     }
 }
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java
index fac8f1a..6e1d825 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2RequestSettingsSet.java
@@ -146,7 +146,7 @@ public class Camera2RequestSettingsSet {
      * to its default value or simply unset. While {@link #get} will return
      * {@code null} in both these cases, this method will return {@code true}
      * and {@code false}, respectively.</p>
-
+     *
      * @param key Which setting to look for.
      * @return Whether that setting has a value that will propagate with unions.
      *
@@ -160,8 +160,23 @@ public class Camera2RequestSettingsSet {
     }
 
     /**
+     * Check whether the value of the specified setting matches the given one.
+     *
+     * <p>This method uses the {@code T} type's {@code equals} method, but is
+     * {@code null}-tolerant.</p>
+     *
+     * @param key Which of this class's settings to check.
+     * @param value Value to test for equality against.
+     * @return Whether they are the same.
+     */
+    public <T> boolean matches(Key<T> key, T value) {
+        return Objects.equals(get(key), value);
+    }
+
+    /**
      * Get this set of settings's revision identifier, which can be compared
      * against cached past values to determine whether it has been modified.
+     *
      * <p>Distinct revisions across the same object do not necessarily indicate
      * that the object's key/value pairs have changed at all, but the same
      * revision on the same object does imply that they've stayed the same.</p>