Merge "CameraITS, TestingCamera2: Update for final camera2 API changes" into lmp-dev

5 files changed, 38 insertions, 38 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 95fb845..94f5218 100644
--- a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java
+++ b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java
@@ -51,8 +51,8 @@ import android.view.Surface;
 
 import com.android.ex.camera2.blocking.BlockingCameraManager;
 import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
-import com.android.ex.camera2.blocking.BlockingStateListener;
-import com.android.ex.camera2.blocking.BlockingSessionListener;
+import com.android.ex.camera2.blocking.BlockingStateCallback;
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -112,7 +112,7 @@ public class ItsService extends Service implements SensorEventListener {
     private HandlerThread mCameraThread = null;
     private Handler mCameraHandler = null;
     private BlockingCameraManager mBlockingCameraManager = null;
-    private BlockingStateListener mCameraListener = null;
+    private BlockingStateCallback mCameraListener = null;
     private CameraDevice mCamera = null;
     private CameraCaptureSession mSession = null;
     private ImageReader[] mCaptureReaders = null;
@@ -170,11 +170,11 @@ public class ItsService extends Service implements SensorEventListener {
     private volatile Object mEventLock = new Object();
     private volatile boolean mEventsEnabled = false;
 
-    public interface CaptureListener {
+    public interface CaptureCallback {
         void onCaptureAvailable(Image capture);
     }
 
-    public abstract class CaptureResultListener extends CameraCaptureSession.CaptureListener {}
+    public abstract class CaptureResultListener extends CameraCaptureSession.CaptureCallback {}
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -194,7 +194,7 @@ public class ItsService extends Service implements SensorEventListener {
                 throw new ItsException("Failed to connect to camera manager");
             }
             mBlockingCameraManager = new BlockingCameraManager(mCameraManager);
-            mCameraListener = new BlockingStateListener();
+            mCameraListener = new BlockingStateCallback();
 
             // Open the camera device, and get its properties.
             String[] devices;
@@ -614,7 +614,7 @@ public class ItsService extends Service implements SensorEventListener {
     }
 
     public ImageReader.OnImageAvailableListener
-            createAvailableListener(final CaptureListener listener) {
+            createAvailableListener(final CaptureCallback listener) {
         return new ImageReader.OnImageAvailableListener() {
             @Override
             public void onImageAvailable(ImageReader reader) {
@@ -632,7 +632,7 @@ public class ItsService extends Service implements SensorEventListener {
     }
 
     private ImageReader.OnImageAvailableListener
-            createAvailableListenerDropper(final CaptureListener listener) {
+            createAvailableListenerDropper(final CaptureCallback listener) {
         return new ImageReader.OnImageAvailableListener() {
             @Override
             public void onImageAvailable(ImageReader reader) {
@@ -695,13 +695,13 @@ public class ItsService extends Service implements SensorEventListener {
             prepareCaptureReader(widths, heights, formats, 1);
             List<Surface> outputSurfaces = new ArrayList<Surface>(1);
             outputSurfaces.add(mCaptureReaders[0].getSurface());
-            BlockingSessionListener sessionListener = new BlockingSessionListener();
+            BlockingSessionCallback sessionListener = new BlockingSessionCallback();
             mCamera.createCaptureSession(outputSurfaces, sessionListener, mCameraHandler);
             mSession = sessionListener.waitAndGetSession(TIMEOUT_IDLE_MS);
 
             // Add a listener that just recycles buffers; they aren't saved anywhere.
             ImageReader.OnImageAvailableListener readerListener =
-                    createAvailableListenerDropper(mCaptureListener);
+                    createAvailableListenerDropper(mCaptureCallback);
             mCaptureReaders[0].setOnImageAvailableListener(readerListener, mSaveHandlers[0]);
 
             // Get the user-specified regions for AE, AWB, AF.
@@ -931,13 +931,13 @@ public class ItsService extends Service implements SensorEventListener {
                 for (int i = 0; i < numSurfaces; i++) {
                     outputSurfaces.add(mCaptureReaders[i].getSurface());
                 }
-                BlockingSessionListener sessionListener = new BlockingSessionListener();
+                BlockingSessionCallback sessionListener = new BlockingSessionCallback();
                 mCamera.createCaptureSession(outputSurfaces, sessionListener, mCameraHandler);
                 mSession = sessionListener.waitAndGetSession(TIMEOUT_IDLE_MS);
 
                 for (int i = 0; i < numSurfaces; i++) {
                     ImageReader.OnImageAvailableListener readerListener =
-                            createAvailableListener(mCaptureListener);
+                            createAvailableListener(mCaptureCallback);
                     mCaptureReaders[i].setOnImageAvailableListener(readerListener,mSaveHandlers[i]);
                 }
 
@@ -1007,7 +1007,7 @@ public class ItsService extends Service implements SensorEventListener {
     public final void onAccuracyChanged(Sensor sensor, int accuracy) {
     }
 
-    private final CaptureListener mCaptureListener = new CaptureListener() {
+    private final CaptureCallback mCaptureCallback = new CaptureCallback() {
         @Override
         public void onCaptureAvailable(Image capture) {
             try {
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
index cd4701b..c8f54d1 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraControlPane.java
@@ -38,7 +38,7 @@ import android.widget.TextView;
 import android.widget.ToggleButton;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCaptureSession.CaptureListener;
+import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
@@ -297,7 +297,7 @@ public class CameraControlPane extends ControlPane {
         return null;
     }
 
-    private CaptureListener mResultListener = new CaptureListener() {
+    private CaptureCallback mResultListener = new CaptureCallback() {
         public void onCaptureCompleted(
                 CameraCaptureSession session,
                 CaptureRequest request,
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
index 7b61b4a..dcb3cab 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
@@ -29,7 +29,7 @@ import android.hardware.camera2.CameraAccessException;
  * A central manager of camera devices and current clients for them.
  *
  */
-public class CameraOps2 extends CameraManager.AvailabilityListener {
+public class CameraOps2 extends CameraManager.AvailabilityCallback {
 
     private final CameraManager mCameraManager;
 
@@ -50,7 +50,7 @@ public class CameraOps2 extends CameraManager.AvailabilityListener {
             TLog.e("Unable to get camera list: %s", e);
         }
 
-        mCameraManager.addAvailabilityListener(this, /*handler*/null);
+        mCameraManager.registerAvailabilityCallback(this, /*handler*/null);
     }
 
     /**
@@ -63,16 +63,16 @@ public class CameraOps2 extends CameraManager.AvailabilityListener {
      * @throws CameraAccessException
      *             if the camera manager cannot be queried
      */
-    public String[] getCamerasAndListen(CameraManager.AvailabilityListener listener)
+    public String[] getCamerasAndListen(CameraManager.AvailabilityCallback listener)
             throws CameraAccessException {
 
-        mCameraManager.addAvailabilityListener(listener, /*handler*/null);
+        mCameraManager.registerAvailabilityCallback(listener, /*handler*/null);
 
         return mCameraManager.getCameraIdList();
     }
 
-    public void removeAvailabilityListener(CameraManager.AvailabilityListener listener) {
-        mCameraManager.removeAvailabilityListener(listener);
+    public void removeAvailabilityCallback(CameraManager.AvailabilityCallback listener) {
+        mCameraManager.unregisterAvailabilityCallback(listener);
     }
 
     @Override
@@ -94,7 +94,7 @@ public class CameraOps2 extends CameraManager.AvailabilityListener {
      * @return true if open call was sent successfully. The client needs to wait
      *         for its listener to be called to determine if open will succeed.
      */
-    public boolean openCamera(String cameraId, CameraDevice.StateListener listener) {
+    public boolean openCamera(String cameraId, CameraDevice.StateCallback listener) {
         for (CameraDevice camera : mOpenCameras) {
             if (camera.getId() == cameraId) {
                 TLog.e("Camera %s is already open", cameraId);
@@ -102,7 +102,7 @@ public class CameraOps2 extends CameraManager.AvailabilityListener {
             }
         }
         try {
-            DeviceStateListener proxyListener = new DeviceStateListener(listener);
+            DeviceStateCallback proxyListener = new DeviceStateCallback(listener);
             mCameraManager.openCamera(cameraId, proxyListener, null);
         } catch (CameraAccessException e) {
             TLog.e("Unable to open camera %s.", e, cameraId);
@@ -121,11 +121,11 @@ public class CameraOps2 extends CameraManager.AvailabilityListener {
         return null;
     }
 
-    private class DeviceStateListener extends CameraDevice.StateListener {
+    private class DeviceStateCallback extends CameraDevice.StateCallback {
 
-        private final CameraDevice.StateListener mClientListener;
+        private final CameraDevice.StateCallback mClientListener;
 
-        public DeviceStateListener(CameraDevice.StateListener clientListener) {
+        public DeviceStateCallback(CameraDevice.StateCallback clientListener) {
             mClientListener = clientListener;
         }
 
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/v1/CameraOps.java b/apps/TestingCamera2/src/com/android/testingcamera2/v1/CameraOps.java
index 1b015b0..aae07e9 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/v1/CameraOps.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/v1/CameraOps.java
@@ -39,8 +39,8 @@ import android.view.SurfaceHolder;
 
 import com.android.ex.camera2.blocking.BlockingCameraManager;
 import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
-import com.android.ex.camera2.blocking.BlockingStateListener;
-import com.android.ex.camera2.blocking.BlockingSessionListener;
+import com.android.ex.camera2.blocking.BlockingStateCallback;
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -64,8 +64,8 @@ public class CameraOps {
 
     private final CameraManager mCameraManager;
     private final BlockingCameraManager mBlockingCameraManager;
-    private final BlockingStateListener mDeviceListener =
-            new BlockingStateListener();
+    private final BlockingStateCallback mDeviceListener =
+            new BlockingStateCallback();
 
     private CameraDevice mCamera;
     private CameraCaptureSession mSession;
@@ -141,10 +141,10 @@ public class CameraOps {
         }
     }
 
-    public void registerCameraListener(CameraManager.AvailabilityListener listener)
+    public void registerCameraListener(CameraManager.AvailabilityCallback listener)
             throws ApiFailureException {
         checkOk();
-        mCameraManager.addAvailabilityListener(listener, mOpsHandler);
+        mCameraManager.registerAvailabilityCallback(listener, mOpsHandler);
     }
 
     public CameraCharacteristics getCameraCharacteristics() {
@@ -207,7 +207,7 @@ public class CameraOps {
     }
 
     private void configureOutputs(List<Surface> outputs) throws CameraAccessException {
-        BlockingSessionListener sessionListener = new BlockingSessionListener();
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback();
         mCamera.createCaptureSession(outputs, sessionListener, mOpsHandler);
         mSession = sessionListener.waitAndGetSession(IDLE_WAIT_MS);
     }
@@ -354,7 +354,7 @@ public class CameraOps {
         }
     }
 
-    public void minimalJpegCapture(final CaptureListener listener, CaptureResultListener l,
+    public void minimalJpegCapture(final CaptureCallback listener, CaptureResultListener l,
             Handler h, CameraControls cameraControl) throws ApiFailureException {
         minimalOpenCamera();
 
@@ -603,10 +603,10 @@ public class CameraOps {
         }
     }
 
-    public interface CaptureListener {
+    public interface CaptureCallback {
         void onCaptureAvailable(Image capture);
     }
 
     public static abstract class CaptureResultListener
-            extends CameraCaptureSession.CaptureListener {}
+            extends CameraCaptureSession.CaptureCallback {}
 }
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java
index 548aaa0..afaa710 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java
@@ -326,7 +326,7 @@ public class TestingCamera2 extends Activity implements SurfaceHolder.Callback {
                 @Override
                 public void run() {
                     try {
-                        mCameraOps.minimalJpegCapture(mCaptureListener, mCaptureResultListener,
+                        mCameraOps.minimalJpegCapture(mCaptureCallback, mCaptureResultListener,
                                 uiHandler, mCameraControl);
                         if (mCurrentPreviewHolder != null) {
                             mCameraOps.minimalPreview(mCurrentPreviewHolder, mCameraControl);
@@ -368,7 +368,7 @@ public class TestingCamera2 extends Activity implements SurfaceHolder.Callback {
         }
     }
 
-    private final CameraOps.CaptureListener mCaptureListener = new CameraOps.CaptureListener() {
+    private final CameraOps.CaptureCallback mCaptureCallback = new CameraOps.CaptureCallback() {
         @Override
         public void onCaptureAvailable(Image capture) {
             if (capture.getFormat() != ImageFormat.JPEG) {