diff options
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java')
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | 17 |
1 files changed, 2 insertions, 15 deletions
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); } } |