summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-06-16 11:00:37 -0700
committerRuben Brunk <rubenbrunk@google.com>2015-07-06 17:49:44 -0700
commit3450ba7879be6522ea46a56c5e66e5382f5dd5ba (patch)
tree201ed5e416af4f44012e6b5c7f2b16bd30cfc673 /services/camera
parenta3b3caaae3fc23b99c5c455ee429f79c270cfbae (diff)
downloadframeworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.zip
frameworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.tar.gz
frameworks_av-3450ba7879be6522ea46a56c5e66e5382f5dd5ba.tar.bz2
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
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index f42fada..92df4e3 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1292,7 +1292,7 @@ void CameraService::notifySystemEvent(int32_t eventId, const int32_t* args, size
status_t CameraService::addListener(const sp<ICameraServiceListener>& listener) {
ALOGV("%s: Add listener %p", __FUNCTION__, listener.get());
- if (listener == 0) {
+ if (listener == nullptr) {
ALOGE("%s: Listener must not be null", __FUNCTION__);
return BAD_VALUE;
}