diff options
author | Sol Boucher <solb@google.com> | 2014-07-16 10:37:00 -0700 |
---|---|---|
committer | Solomon Boucher <solb@google.com> | 2014-07-16 21:00:01 +0000 |
commit | 7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7 (patch) | |
tree | 0d529f8a2826ad2b4d17c86112bd35599ba3b2e3 /camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | |
parent | a0842b40441db5332a5290f941021636b1182761 (diff) | |
download | android_frameworks_ex-7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7.tar.gz android_frameworks_ex-7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7.tar.bz2 android_frameworks_ex-7e0d39bf7b6e0f0df606e3f6c15f673f70fed3f7.zip |
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)
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); } } |