diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-06-11 17:03:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 17:03:13 +0000 |
| commit | 2c79bf19fc6622e757794eb835798d7ce00eac2e (patch) | |
| tree | 092af2b2a02549aa9fbb01f52945a37a5b6cb917 /services | |
| parent | 5ceae88bc98624cb65d568ebb33939dccec0b316 (diff) | |
| parent | 3416f9ac471f97e9544ee821a97a101cbdd25b11 (diff) | |
| download | frameworks_av-2c79bf19fc6622e757794eb835798d7ce00eac2e.zip frameworks_av-2c79bf19fc6622e757794eb835798d7ce00eac2e.tar.gz frameworks_av-2c79bf19fc6622e757794eb835798d7ce00eac2e.tar.bz2 | |
am 3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview-dev
* commit '3416f9ac471f97e9544ee821a97a101cbdd25b11':
Camera2: Add null check to createStream
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 4fce1b3..8154e59 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -310,6 +310,10 @@ status_t CameraDeviceClient::createStream(int width, int height, int format, Mutex::Autolock icl(mBinderSerializationLock); + if (bufferProducer == NULL) { + ALOGE("%s: bufferProducer must not be null", __FUNCTION__); + return BAD_VALUE; + } if (!mDevice.get()) return DEAD_OBJECT; // Don't create multiple streams for the same target surface |