From 3450ba7879be6522ea46a56c5e66e5382f5dd5ba Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Tue, 16 Jun 2015 11:00:37 -0700 Subject: camera2: Fix native binder interface and add tests. - Add CameraBinderTests for limited coverage of native camera2 binder interfaces for the camera service. - Fix several bugs in the native binder interfaces. Bug: 18468810 Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c --- camera/ICameraServiceListener.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'camera/ICameraServiceListener.cpp') diff --git a/camera/ICameraServiceListener.cpp b/camera/ICameraServiceListener.cpp index 90a8bc2..0010325 100644 --- a/camera/ICameraServiceListener.cpp +++ b/camera/ICameraServiceListener.cpp @@ -45,8 +45,7 @@ public: virtual void onStatusChanged(Status status, int32_t cameraId) { Parcel data, reply; - data.writeInterfaceToken( - ICameraServiceListener::getInterfaceDescriptor()); + data.writeInterfaceToken(ICameraServiceListener::getInterfaceDescriptor()); data.writeInt32(static_cast(status)); data.writeInt32(cameraId); @@ -60,8 +59,7 @@ public: virtual void onTorchStatusChanged(TorchStatus status, const String16 &cameraId) { Parcel data, reply; - data.writeInterfaceToken( - ICameraServiceListener::getInterfaceDescriptor()); + data.writeInterfaceToken(ICameraServiceListener::getInterfaceDescriptor()); data.writeInt32(static_cast(status)); data.writeString16(cameraId); @@ -73,14 +71,12 @@ public: } }; -IMPLEMENT_META_INTERFACE(CameraServiceListener, - "android.hardware.ICameraServiceListener"); +IMPLEMENT_META_INTERFACE(CameraServiceListener, "android.hardware.ICameraServiceListener"); // ---------------------------------------------------------------------- -status_t BnCameraServiceListener::onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) -{ +status_t BnCameraServiceListener::onTransact(uint32_t code, const Parcel& data, Parcel* reply, + uint32_t flags) { switch(code) { case STATUS_CHANGED: { CHECK_INTERFACE(ICameraServiceListener, data, reply); -- cgit v1.1