diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 20:41:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 20:41:28 +0000 |
| commit | 984591672a6f4096ee92c4a582d4c54ee6023c43 (patch) | |
| tree | 9771e9ec381015d13234d32905176b7e8ffce6c8 /services | |
| parent | 4492b55354e3fa18330d389ced1daf1635fdde33 (diff) | |
| parent | 9a17941fa70e43119d2c3464bc00a3cd30b2bd14 (diff) | |
| download | frameworks_av-984591672a6f4096ee92c4a582d4c54ee6023c43.zip frameworks_av-984591672a6f4096ee92c4a582d4c54ee6023c43.tar.gz frameworks_av-984591672a6f4096ee92c4a582d4c54ee6023c43.tar.bz2 | |
Merge "Camera3Device: Default-initialize operating mode." into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 852751c..b16b881 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -57,6 +57,7 @@ namespace android { Camera3Device::Camera3Device(int id): mId(id), + mIsConstrainedHighSpeedConfiguration(false), mHal3Device(NULL), mStatus(STATUS_UNINITIALIZED), mUsePartialResult(false), @@ -420,7 +421,7 @@ status_t Camera3Device::dump(int fd, const Vector<String16> &args) { } lines.appendFormat(" Stream configuration:\n"); lines.appendFormat(" Operation mode: %s \n", mIsConstrainedHighSpeedConfiguration ? - "CONSTAINED HIGH SPEED VIDEO" : "NORMAL"); + "CONSTRAINED HIGH SPEED VIDEO" : "NORMAL"); if (mInputStream != NULL) { write(fd, lines.string(), lines.size()); |