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/api2 | |
| parent | d7640491ba0cf2ef8424734a942f38f80535591b (diff) | |
| download | frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.zip frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.tar.gz frameworks_av-38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b.tar.bz2 | |
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/api2')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 5 | ||||
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 0c531c3..bd9fea3 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -787,8 +787,11 @@ status_t CameraDeviceClient::tearDown(int streamId) { return res; } - status_t CameraDeviceClient::dump(int fd, const Vector<String16>& args) { + return BasicClient::dump(fd, args); +} + +status_t CameraDeviceClient::dumpClient(int fd, const Vector<String16>& args) { String8 result; result.appendFormat("CameraDeviceClient[%d] (%p) dump:\n", mCameraId, diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index d1e692c..b1d1762 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h @@ -135,6 +135,8 @@ public: virtual status_t dump(int fd, const Vector<String16>& args); + virtual status_t dumpClient(int fd, const Vector<String16>& args); + /** * Device listener interface */ |