diff options
| author | 2016-04-28 09:14:32 -0700 | |
|---|---|---|
| committer | 2016-04-28 09:14:32 -0700 | |
| commit | 68a593e7fa07c947fef2c5de53c42e14ed630a8a (patch) | |
| tree | 6ae7a67ecfddd080d915a6a3de6f98bfe54a33c4 /libs/binder/IProcessInfoService.cpp | |
| parent | 53925d208ade2f844f018ed2ca0fb042ce7db85d (diff) | |
| parent | 168dc86c261bd7770b99b1803a769eb658f13f96 (diff) | |
resolve merge conflicts of 168dc86 to nyc-dev-plus-aosp
Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
Diffstat (limited to 'libs/binder/IProcessInfoService.cpp')
| -rw-r--r-- | libs/binder/IProcessInfoService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/IProcessInfoService.cpp b/libs/binder/IProcessInfoService.cpp index 76508b88bf..96e1a8c239 100644 --- a/libs/binder/IProcessInfoService.cpp +++ b/libs/binder/IProcessInfoService.cpp @@ -25,7 +25,7 @@ namespace android { class BpProcessInfoService : public BpInterface<IProcessInfoService> { public: - BpProcessInfoService(const sp<IBinder>& impl) + explicit BpProcessInfoService(const sp<IBinder>& impl) : BpInterface<IProcessInfoService>(impl) {} virtual status_t getProcessStatesFromPids(size_t length, /*in*/ int32_t* pids, |