DO NOT MERGE: Fix oversight while refactoring CameraStateHolder

The base class still (redundantly) defined states, and AndroidCameraStateMachine
was overriding methods with a verbatim copy of their implementations.

Change-Id: I0e6361417edb159f91b89409058ee9a73b1101d9
(cherry-picked from commit dbc457417c581c21b5d49539325b1b152dc1baba)

3 files changed, 3 insertions, 42 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
index ec1f794..8b62c7b 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
@@ -658,25 +658,12 @@ class AndroidCamera2AgentImpl extends CameraAgent {
         /** A preview is currently being streamed. */
         public static final int CAMERA_PREVIEW_ACTIVE = 5;
 
-        private int mState;
-
         public AndroidCamera2StateHolder() {
             this(CAMERA_UNOPENED);
         }
 
         public AndroidCamera2StateHolder(int state) {
-            setState(state);
-        }
-
-        @Override
-        public synchronized void setState(int state) {
-            mState = state;
-            this.notifyAll();
-        }
-
-        @Override
-        public synchronized int getState() {
-            return mState;
+            super(state);
         }
     }
 
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 328c8f4..9bbbb7a 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -768,7 +768,7 @@ class AndroidCameraAgentImpl extends CameraAgent {
             mDispatchThread.runJob(new Runnable() {
                 @Override
                 public void run() {
-                    mCameraState.waitForStates(CameraStateHolder.CAMERA_IDLE |
+                    mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE |
                             AndroidCameraStateHolder.CAMERA_UNLOCKED);
                     mCameraHandler.requestTakePicture(ShutterCallbackForward
                                     .getNewInstance(handler, AndroidCameraProxyImpl.this, shutter),
@@ -900,25 +900,12 @@ class AndroidCameraAgentImpl extends CameraAgent {
         public static final int CAMERA_CAPTURING = 1 << 3;
         public static final int CAMERA_FOCUSING = 1 << 4;
 
-        private int mState;
-
         public AndroidCameraStateHolder() {
             this(CAMERA_UNOPENED);
         }
 
         public AndroidCameraStateHolder(int state) {
-            setState(state);
-        }
-
-        @Override
-        public synchronized void setState(int state) {
-            mState = state;
-            this.notifyAll();
-        }
-
-        @Override
-        public synchronized int getState() {
-            return mState;
+            super(state);
         }
     }
 
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 5df541a..35ae51c 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
@@ -23,21 +23,8 @@ import com.android.ex.camera2.portability.debug.Log;
 public abstract class CameraStateHolder {
     private static final Log.Tag TAG = new Log.Tag("CamStateHolder");
 
-    /** Camera states **/
-    // These states are defined bitwise so we can easily to specify a set of
-    // states together.
-    public static final int CAMERA_UNOPENED = 1;
-    public static final int CAMERA_IDLE = 1 << 1;
-    public static final int CAMERA_UNLOCKED = 1 << 2;
-    public static final int CAMERA_CAPTURING = 1 << 3;
-    public static final int CAMERA_FOCUSING = 1 << 4;
-
     private int mState;
 
-    public CameraStateHolder() {
-        setState(CAMERA_UNOPENED);
-    }
-
     public CameraStateHolder(int state) {
         setState(state);
     }