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)

1 files changed, 1 insertions, 14 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);
         }
     }