diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-01-14 22:35:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 22:35:00 +0000 |
| commit | fb5043a703f596b7393c1e24ca4b321b0f697293 (patch) | |
| tree | e73accf4133146bc489c380a720173e55c6e7fbe /services/camera/libcameraservice/CameraService.cpp | |
| parent | 6dd6c546513aa18dc1d7fba0f72d670edce34f77 (diff) | |
| parent | 795243686fe2e1c352732b47bcdb6ea9e9e7e39e (diff) | |
| download | frameworks_av-fb5043a703f596b7393c1e24ca4b321b0f697293.zip frameworks_av-fb5043a703f596b7393c1e24ca4b321b0f697293.tar.gz frameworks_av-fb5043a703f596b7393c1e24ca4b321b0f697293.tar.bz2 | |
Camera: Disallow dumping clients directly am: c400396525
am: 795243686f
* commit '795243686fe2e1c352732b47bcdb6ea9e9e7e39e':
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 897fa1b..a560b93 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1945,6 +1945,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; } @@ -2397,7 +2405,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(); |