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/common | |
| 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/common')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.cpp | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp index 5732f80..c7de56a 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp +++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp @@ -124,7 +124,7 @@ Camera2ClientBase<TClientBase>::~Camera2ClientBase() { } template <typename TClientBase> -status_t Camera2ClientBase<TClientBase>::dump(int fd, +status_t Camera2ClientBase<TClientBase>::dumpClient(int fd, const Vector<String16>& args) { String8 result; result.appendFormat("Camera2ClientBase[%d] (%p) PID: %d, dump:\n", diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.h b/services/camera/libcameraservice/common/Camera2ClientBase.h index 220c5ad..4568af0 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.h +++ b/services/camera/libcameraservice/common/Camera2ClientBase.h @@ -57,7 +57,7 @@ public: virtual ~Camera2ClientBase(); virtual status_t initialize(CameraModule *module); - virtual status_t dump(int fd, const Vector<String16>& args); + virtual status_t dumpClient(int fd, const Vector<String16>& args); /** * CameraDeviceBase::NotificationListener implementation |