diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:20 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:20 -0800 |
| commit | edd6ca3e244dda4687da86bc614a2bb709b3a963 (patch) | |
| tree | 4efd0f4664f7f5e88434844c2eb70cdff4aab5d1 /services/camera/libcameraservice/common/Camera2ClientBase.h | |
| parent | 808632f7bf0a897fb55cc38170ad6c1b2fd86ba2 (diff) | |
| parent | 38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b (diff) | |
| download | frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.zip frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.tar.gz frameworks_av-edd6ca3e244dda4687da86bc614a2bb709b3a963.tar.bz2 | |
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17
Ticket: CYNGNOS-1854
Diffstat (limited to 'services/camera/libcameraservice/common/Camera2ClientBase.h')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |