diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-11-11 00:07:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 00:07:16 +0000 |
| commit | 6e48af3d909568ed2f07b79369d52f9415100208 (patch) | |
| tree | 5b12cc93d48574361df9b3d2867135333694674c /camera | |
| parent | aa97f7093c8bb99ad5f86294fef7a070be0e206f (diff) | |
| parent | 7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731 (diff) | |
| download | frameworks_av-6e48af3d909568ed2f07b79369d52f9415100208.zip frameworks_av-6e48af3d909568ed2f07b79369d52f9415100208.tar.gz frameworks_av-6e48af3d909568ed2f07b79369d52f9415100208.tar.bz2 | |
am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NULL interfaces"
* commit '7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731':
Camera: Guard against asBinder() calls on NULL interfaces
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/ICamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/ICamera.cpp b/camera/ICamera.cpp index 8c6e1f7..ca31c65 100644 --- a/camera/ICamera.cpp +++ b/camera/ICamera.cpp @@ -75,7 +75,7 @@ public: ALOGV("setPreviewTarget"); Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - sp<IBinder> b(bufferProducer->asBinder()); + sp<IBinder> b(bufferProducer != NULL ? bufferProducer->asBinder() : NULL); data.writeStrongBinder(b); remote()->transact(SET_PREVIEW_TARGET, data, &reply); return reply.readInt32(); |