camera2-portability: Rename CameraManager to CameraAgent

This resolves a naming clash with a class in the new camera2 framework API.

Change-Id: Id53aa3e0bbe9e9edaa82b0aec695fd835c3d0ef9

4 files changed, 35 insertions, 35 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index a2266a6..8e9d799 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -40,9 +40,9 @@ import com.android.ex.camera2.portability.debug.Log;
 import java.io.IOException;
 
 /**
- * A class to implement {@link CameraManager} of the Android camera framework.
+ * A class to implement {@link CameraAgent} of the Android camera framework.
  */
-class AndroidCameraManagerImpl implements CameraManager {
+class AndroidCameraAgentImpl implements CameraAgent {
     private static final Log.Tag TAG = new Log.Tag("AndroidCamMgrImpl");
 
     private Parameters mParameters;
@@ -63,7 +63,7 @@ class AndroidCameraManagerImpl implements CameraManager {
             }
         };
 
-    AndroidCameraManagerImpl() {
+    AndroidCameraAgentImpl() {
         mCameraHandlerThread = new HandlerThread("Camera Handler Thread");
         mCameraHandlerThread.start();
         mCameraHandler = new CameraHandler(mCameraHandlerThread.getLooper());
@@ -301,7 +301,7 @@ class AndroidCameraManagerImpl implements CameraManager {
                             mCamera.reconnect();
                         } catch (IOException ex) {
                             if (cbForward != null) {
-                                cbForward.onReconnectionFailure(AndroidCameraManagerImpl.this,
+                                cbForward.onReconnectionFailure(AndroidCameraAgentImpl.this,
                                         generateHistoryString(mCameraId));
                             }
                             break;
@@ -601,10 +601,10 @@ class AndroidCameraManagerImpl implements CameraManager {
     }
 
     /**
-     * A class which implements {@link CameraManager.CameraProxy} and
+     * A class which implements {@link CameraAgent.CameraProxy} and
      * camera handler thread.
      */
-    private class AndroidCameraProxyImpl implements CameraManager.CameraProxy {
+    private class AndroidCameraProxyImpl implements CameraAgent.CameraProxy {
         private final int mCameraId;
         /* TODO: remove this Camera instance. */
         private final Camera mCamera;
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraManager.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
index c0484ab..91598e3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraManager.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
@@ -28,8 +28,8 @@ import android.view.SurfaceHolder;
 /**
  * An interface which provides possible camera device operations.
  *
- * The client should call {@code CameraManager.openCamera} to get an instance
- * of {@link CameraManager.CameraProxy} to control the camera. Classes
+ * The client should call {@code CameraAgent.openCamera} to get an instance
+ * of {@link CameraAgent.CameraProxy} to control the camera. Classes
  * implementing this interface should have its own one unique {@code Thread}
  * other than the main thread for camera operations. Camera device callbacks
  * are wrapped since the client should not deal with
@@ -39,7 +39,7 @@ import android.view.SurfaceHolder;
  * {@code android.hardware.Camera.ErrorCallback},
  * {@code android.hardware.Camera.OnZoomChangeListener}, and
  */
-public interface CameraManager {
+public interface CameraAgent {
     public static final long CAMERA_OPERATION_TIMEOUT_MS = 2500;
 
     public static class CameraStartPreviewCallbackForward
@@ -145,7 +145,7 @@ public interface CameraManager {
         }
 
         @Override
-        public void onReconnectionFailure(final CameraManager mgr, final String info) {
+        public void onReconnectionFailure(final CameraAgent mgr, final String info) {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
@@ -275,17 +275,17 @@ public interface CameraManager {
          * Callback when {@link java.io.IOException} is caught during
          * {@link android.hardware.Camera#reconnect()}.
          *
-         * @param mgr The {@link CameraManager}
+         * @param mgr The {@link CameraAgent}
          *            with the reconnect failure.
          */
-        public void onReconnectionFailure(CameraManager mgr, String info);
+        public void onReconnectionFailure(CameraAgent mgr, String info);
     }
 
     /**
      * Opens the camera of the specified ID asynchronously. The camera device
      * will be opened in the camera handler thread and will be returned through
-     * the {@link CameraManager.CameraOpenCallback#
-     * onCameraOpened(com.android.camera.cameradevice.CameraManager.CameraProxy)}.
+     * the {@link CameraAgent.CameraOpenCallback#
+     * onCameraOpened(com.android.camera.cameradevice.CameraAgent.CameraProxy)}.
      *
      * @param handler The {@link android.os.Handler} in which the callback
      *                was handled.
@@ -310,7 +310,7 @@ public interface CameraManager {
             Handler handler);
 
     /**
-     * Recycles the resources used by this instance. CameraManager will be in
+     * Recycles the resources used by this instance. CameraAgent will be in
      * an unusable state after calling this.
      */
     public void recycle();
@@ -338,7 +338,7 @@ public interface CameraManager {
 
         /**
          * @return The camera ID associated to by this
-         * {@link CameraManager.CameraProxy}.
+         * {@link CameraAgent.CameraProxy}.
          */
         public int getCameraId();
 
@@ -349,8 +349,8 @@ public interface CameraManager {
 
         /**
          * Reconnects to the camera device. On success, the camera device will
-         * be returned through {@link CameraManager
-         * .CameraOpenCallback#onCameraOpened(com.android.camera.cameradevice.CameraManager
+         * be returned through {@link CameraAgent
+         * .CameraOpenCallback#onCameraOpened(com.android.camera.cameradevice.CameraAgent
          * .CameraProxy)}.
          * @see android.hardware.Camera#reconnect()
          *
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraManagerFactory.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
index 14a6010..9b3160b 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraManagerFactory.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgentFactory.java
@@ -17,26 +17,26 @@
 package com.android.ex.camera2.portability;
 
 /**
- * A factory class for {@link CameraManager}.
+ * A factory class for {@link CameraAgent}.
  */
-public class CameraManagerFactory {
+public class CameraAgentFactory {
 
-    private static AndroidCameraManagerImpl sAndroidCameraManager;
-    private static int sAndoridCameraManagerClientCount;
+    private static AndroidCameraAgentImpl sAndroidCameraAgent;
+    private static int sAndroidCameraAgentClientCount;
 
     /**
-     * Returns the android camera implementation of {@link com.android.camera.cameradevice.CameraManager}.
+     * Returns the android camera implementation of {@link com.android.camera.cameradevice.CameraAgent}.
      *
-     * @return The {@link CameraManager} to control the camera device.
+     * @return The {@link CameraAgent} to control the camera device.
      */
-    public static synchronized CameraManager getAndroidCameraManager() {
-        if (sAndroidCameraManager == null) {
-            sAndroidCameraManager = new AndroidCameraManagerImpl();
-            sAndoridCameraManagerClientCount = 1;
+    public static synchronized CameraAgent getAndroidCameraAgent() {
+        if (sAndroidCameraAgent == null) {
+            sAndroidCameraAgent = new AndroidCameraAgentImpl();
+            sAndoridCameraAgentClientCount = 1;
         } else {
-            ++sAndoridCameraManagerClientCount;
+            ++sAndoridCameraAgentClientCount;
         }
-        return sAndroidCameraManager;
+        return sAndroidCameraAgent;
     }
 
     /**
@@ -44,9 +44,9 @@ public class CameraManagerFactory {
      * stopped.
      */
     public static synchronized void recycle() {
-        if (--sAndoridCameraManagerClientCount == 0 && sAndroidCameraManager != null) {
-            sAndroidCameraManager.recycle();
-            sAndroidCameraManager = null;
+        if (--sAndoridCameraAgentClientCount == 0 && sAndroidCameraAgent != null) {
+            sAndroidCameraAgent.recycle();
+            sAndroidCameraAgent = null;
         }
     }
 }
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
index 0afec2e..02d6c48 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
@@ -101,7 +101,7 @@ class CameraStateHolder {
             public boolean success() {
                 return (states | mState) == states;
             }
-        }, CameraManager.CAMERA_OPERATION_TIMEOUT_MS);
+        }, CameraAgent.CAMERA_OPERATION_TIMEOUT_MS);
     }
 
     /**
@@ -118,6 +118,6 @@ class CameraStateHolder {
             public boolean success() {
                 return (states & mState) == 0;
             }
-        }, CameraManager.CAMERA_OPERATION_TIMEOUT_MS);
+        }, CameraAgent.CAMERA_OPERATION_TIMEOUT_MS);
     }
 }