diff options
author | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
commit | 77e79a509d19ab50b1867fe3903b5a8fae450591 (patch) | |
tree | 881d068bdc54d4835665e48649165f07393caafa /camera/camera2/ICameraDeviceUser.cpp | |
parent | 575174d62b665900203d70a4d410329b8918c2af (diff) | |
parent | e78a27ca9c701aa996eee0e47fa26dd69d80ffcf (diff) | |
download | frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.zip frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.gz frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.bz2 |
resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp
Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
Diffstat (limited to 'camera/camera2/ICameraDeviceUser.cpp')
-rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index ff4a0c2..35345d2 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -219,7 +219,7 @@ public: data.writeInt32(1); // marker that bufferProducer is not null data.writeString16(String16("unknown_name")); // name of surface - sp<IBinder> b(bufferProducer->asBinder()); + sp<IBinder> b(IInterface::asBinder(bufferProducer)); data.writeStrongBinder(b); remote()->transact(CREATE_STREAM, data, &reply); |