diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-07-07 19:31:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 19:31:53 +0000 |
| commit | 878b8f1a0128cf63617782e3073dffb212d0c8f1 (patch) | |
| tree | 71045bbd8b8ebed4b5139ce6e4ef5bd490823b1b /services/camera | |
| parent | 637709460ea75e927a5802899d6547bca3b5e7be (diff) | |
| parent | 3450ba7879be6522ea46a56c5e66e5382f5dd5ba (diff) | |
| download | frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.zip frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.tar.gz frameworks_av-878b8f1a0128cf63617782e3073dffb212d0c8f1.tar.bz2 | |
Merge "camera2: Fix native binder interface and add tests." into mnc-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 2 |
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; } |