1 files changed, 38 insertions, 0 deletions
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 35ae51c..b758af2 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
@@ -24,20 +24,56 @@ public abstract class CameraStateHolder {
     private static final Log.Tag TAG = new Log.Tag("CamStateHolder");
 
     private int mState;
+    private boolean mInvalid;
 
+    /**
+     * Construct a new instance of @{link CameraStateHolder} with an initial state.
+     *
+     * @param state The initial state.
+     */
     public CameraStateHolder(int state) {
         setState(state);
+        mInvalid = false;
     }
 
+    /**
+     * Change to a new state.
+     *
+     * @param state The new state.
+     */
     public synchronized void setState(int state) {
+        if (mState != state) {
+            Log.v(TAG, "setState - state = " + Integer.toBinaryString(state));
+        }
         mState = state;
         this.notifyAll();
     }
 
+    /**
+     * Obtain the current state.
+     *
+     * @return The current state.
+     */
     public synchronized int getState() {
         return mState;
     }
 
+    /**
+     * Change the state to be invalid. Once invalidated, the state will be invalid forever.
+     */
+    public synchronized void invalidate() {
+        mInvalid = true;
+    }
+
+    /**
+     * Whether the state is invalid.
+     *
+     * @return True if the state is invalid.
+     */
+    public synchronized boolean isInvalid() {
+        return mInvalid;
+    }
+
     private static interface ConditionChecker {
         /**
          * @return Whether the condition holds.
@@ -83,6 +119,7 @@ public abstract class CameraStateHolder {
      *         reached.
      */
     public boolean waitForStates(final int states) {
+        Log.v(TAG, "waitForStates - states = " + Integer.toBinaryString(states));
         return waitForCondition(new ConditionChecker() {
             @Override
             public boolean success() {
@@ -100,6 +137,7 @@ public abstract class CameraStateHolder {
      *         reached.
      */
     public boolean waitToAvoidStates(final int states) {
+        Log.v(TAG, "waitToAvoidStates - states = " + Integer.toBinaryString(states));
         return waitForCondition(new ConditionChecker() {
             @Override
             public boolean success() {