diff options
author | Sol Boucher <solb@google.com> | 2014-08-27 04:53:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-27 04:53:27 +0000 |
commit | ec891dde6a5de29ed505692b653f3ba3b3cae81f (patch) | |
tree | f27138161fad87a0011baac5bca1784c1fca191e | |
parent | 444909d9aff00d322b5a596e576175bcf1550504 (diff) | |
parent | 7c8d6957b96c75ce11f7373f4ab2451ee4666360 (diff) | |
download | android_frameworks_ex-ec891dde6a5de29ed505692b653f3ba3b3cae81f.tar.gz android_frameworks_ex-ec891dde6a5de29ed505692b653f3ba3b3cae81f.tar.bz2 android_frameworks_ex-ec891dde6a5de29ed505692b653f3ba3b3cae81f.zip |
am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev
* commit '7c8d6957b96c75ce11f7373f4ab2451ee4666360':
camera2-portability: Fix zoom occasionally not working
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java | 15 |
1 files changed, 12 insertions, 3 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 2a30063..44f19bc 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java @@ -930,6 +930,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { private final CameraDevice mCamera; private final CameraDeviceInfo.Characteristics mCharacteristics; private final AndroidCamera2Capabilities mCapabilities; + private CameraSettings mLastSettings; public AndroidCamera2ProxyImpl(int cameraIndex, CameraDevice camera, CameraDeviceInfo.Characteristics characteristics, @@ -938,6 +939,7 @@ class AndroidCamera2AgentImpl extends CameraAgent { mCamera = camera; mCharacteristics = characteristics; mCapabilities = new AndroidCamera2Capabilities(properties); + mLastSettings = null; } // TODO: Implement @@ -1108,7 +1110,10 @@ class AndroidCamera2AgentImpl extends CameraAgent { @Override public CameraSettings getSettings() { - return mCameraHandler.buildSettings(mCapabilities); + if (mLastSettings == null) { + mLastSettings = mCameraHandler.buildSettings(mCapabilities); + } + return mLastSettings; } @Override @@ -1122,9 +1127,13 @@ class AndroidCamera2AgentImpl extends CameraAgent { return false; } - return applySettingsHelper(settings, AndroidCamera2StateHolder.CAMERA_UNCONFIGURED | + if (applySettingsHelper(settings, AndroidCamera2StateHolder.CAMERA_UNCONFIGURED | AndroidCamera2StateHolder.CAMERA_CONFIGURED | - AndroidCamera2StateHolder.CAMERA_PREVIEW_READY); + AndroidCamera2StateHolder.CAMERA_PREVIEW_READY)) { + mLastSettings = settings; + return true; + } + return false; } // TODO: Implement |