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/common | |
| 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/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 |