diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-05-12 12:58:02 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2014-06-18 10:24:45 -0700 |
| commit | 742beb4e81cfcdfa9d4f7d3252be7be797a1e462 (patch) | |
| tree | 59eb7140a9ea3e41c63282332c7923ff49feb571 /camera2 | |
| parent | c36e3c983c232dc45ed31f3d8e98d8cdd7ac14ba (diff) | |
| download | android_frameworks_ex-742beb4e81cfcdfa9d4f7d3252be7be797a1e462.tar.gz android_frameworks_ex-742beb4e81cfcdfa9d4f7d3252be7be797a1e462.tar.bz2 android_frameworks_ex-742beb4e81cfcdfa9d4f7d3252be7be797a1e462.zip | |
Don't use stale parameters for capabilities.
Bug: 14823111
Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
Diffstat (limited to 'camera2')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java index 9fa7436..bcf2c7c 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java @@ -240,7 +240,7 @@ class AndroidCameraManagerImpl implements CameraManager { private Camera mCamera; private int mCameraId; - private LinkedList<Integer> mMsgHistory; + private final LinkedList<Integer> mMsgHistory; private class CaptureCallbacks { public final ShutterCallback mShutter; @@ -355,9 +355,7 @@ class AndroidCameraManagerImpl implements CameraManager { mParametersIsDirty = true; // Get a instance of Camera.Parameters for later use. - if (mParamsToSet == null) { - mParamsToSet = mCamera.getParameters(); - } + mParamsToSet = mCamera.getParameters(); mCameraState.setState(CAMERA_IDLE); if (openCallback != null) { |