commit e992e75053e98e3699af6e344c11b787e30411ad
author Eino-Ville Talvala <etalvala@google.com> Fri Nov 07 16:17:48 2014 -0800
committer Eino-Ville Talvala <etalvala@google.com> Fri Nov 07 16:32:55 2014 -0800
tree c0a88c5e09f9f4a7fdcb56eda9c60497124bf783
parent e1a2df553a6d151807a5da738a3cd853bef908d9

Camera: Guard against asBinder() calls on NULL interfaces

Bug: 18207548
Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0

camera/ICamera.cpp

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 @@
         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();