diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-06-19 17:41:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 17:41:55 +0000 |
| commit | eee9697a910c664d2721ef3fcf4e1fad4263466d (patch) | |
| tree | f203edc88138caae47203b90583475ccb3e3b7bc /services | |
| parent | c764de34b37abb05f7ff25fa5f8d540505bb8645 (diff) | |
| parent | 17338fca4a51dfb32c1291f94b65d4b4f30b682d (diff) | |
| download | frameworks_av-eee9697a910c664d2721ef3fcf4e1fad4263466d.zip frameworks_av-eee9697a910c664d2721ef3fcf4e1fad4263466d.tar.gz frameworks_av-eee9697a910c664d2721ef3fcf4e1fad4263466d.tar.bz2 | |
Merge "Camera3Device: Fix high speed configuration" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index c28a57e..9d725de 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -1033,7 +1033,11 @@ status_t Camera3Device::configureStreams(bool isConstrainedHighSpeed) { Mutex::Autolock il(mInterfaceLock); Mutex::Autolock l(mLock); - mIsConstrainedHighSpeedConfiguration = isConstrainedHighSpeed; + + if (mIsConstrainedHighSpeedConfiguration != isConstrainedHighSpeed) { + mNeedConfig = true; + mIsConstrainedHighSpeedConfiguration = isConstrainedHighSpeed; + } return configureStreamsLocked(); } |