diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2016-01-13 10:07:04 -0800 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-01-22 13:36:16 -0800 |
commit | 38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b (patch) | |
tree | 3edcea13261beb3b42a2b4e4d55ab14e3ace186e /services/camera/libcameraservice/CameraService.cpp | |
parent | d7640491ba0cf2ef8424734a942f38f80535591b (diff) | |
download | frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.tar.gz frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.tar.bz2 frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.zip |
Camera: Disallow dumping clients directly
Camera service dumps should only be initiated through
ICameraService::dump.
Bug: 26265403
Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803
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 3deb3965ae..7c4594fa4b 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(); |