diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-01-14 22:33:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 22:33:06 +0000 |
| commit | 795243686fe2e1c352732b47bcdb6ea9e9e7e39e (patch) | |
| tree | 3edcea13261beb3b42a2b4e4d55ab14e3ace186e /services/camera/libcameraservice/CameraService.cpp | |
| parent | e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e (diff) | |
| parent | c4003965258404a19b99280ac0f475e2f290bf27 (diff) | |
| download | frameworks_av-795243686fe2e1c352732b47bcdb6ea9e9e7e39e.zip frameworks_av-795243686fe2e1c352732b47bcdb6ea9e9e7e39e.tar.gz frameworks_av-795243686fe2e1c352732b47bcdb6ea9e9e7e39e.tar.bz2 | |
Camera: Disallow dumping clients directly
am: c400396525
* commit 'c4003965258404a19b99280ac0f475e2f290bf27':
Camera: Disallow dumping clients directly
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 3deb396..7c4594f 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1944,6 +1944,14 @@ void CameraService::BasicClient::disconnect() { mClientPid = 0; } +status_t CameraService::BasicClient::dump(int, const Vector<String16>&) { + // No dumping of clients directly over Binder, + // must go through CameraService::dump + android_errorWriteWithInfoLog(SN_EVENT_LOG_ID, "26265403", + IPCThreadState::self()->getCallingUid(), NULL, 0); + return OK; +} + String16 CameraService::BasicClient::getPackageName() const { return mClientPackageName; } @@ -2396,7 +2404,7 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { String8(client->getPackageName()).string()); write(fd, result.string(), result.size()); - client->dump(fd, args); + client->dumpClient(fd, args); } if (stateLocked) mCameraStatesLock.unlock(); |