DO NOT MERGE: Minor style fixes.

- BlockingCameraManager had the wrong TAG.
- Added static / final to NUM_STATES.
- Javadoc @param mismatch.

Change-Id: I0dbe6b3d4bdcb5a51ba0aea89985c3495a59381e
(cherry picked from commit 5a772174d14175474e76701b07cc0be86c3df32a)

2 files changed, 3 insertions, 3 deletions

diff --git a/camera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java b/camera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
index 48cca17..564cd90 100644
--- a/camera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
+++ b/camera2/public/src/com/android/ex/camera2/utils/StateChangeListener.java
@@ -17,5 +17,5 @@
 package com.android.ex.camera2.utils;
 
 public interface StateChangeListener {
-    public void onStateChanged(int state);
+    void onStateChanged(int state);
 }
diff --git a/camera2/public/src/com/android/ex/camera2/utils/StateWaiter.java b/camera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
index ec57829..1eb3037 100644
--- a/camera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
+++ b/camera2/public/src/com/android/ex/camera2/utils/StateWaiter.java
@@ -87,7 +87,7 @@ public final class StateWaiter {
      *
      * <p>Note: Only one waiter allowed at a time!</p>
      *
-     * @param desired state to observe a transition to
+     * @param state state to observe a transition to
      * @param timeoutMs how long to wait in milliseconds
      *
      * @throws IllegalArgumentException if {@code state} was out of range
@@ -196,7 +196,7 @@ public final class StateWaiter {
 
         try {
             mQueuedStates.put(state);
-        } catch(InterruptedException e) {
+        } catch (InterruptedException e) {
             throw new UnsupportedOperationException("Unable to set current state", e);
         }
     }