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/api1/Camera2Client.cpp | |
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/api1/Camera2Client.cpp')
-rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 1821636..96266ed 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -163,6 +163,10 @@ Camera2Client::~Camera2Client() { } status_t Camera2Client::dump(int fd, const Vector<String16>& args) { + return BasicClient::dump(fd, args); +} + +status_t Camera2Client::dumpClient(int fd, const Vector<String16>& args) { String8 result; result.appendFormat("Client2[%d] (%p) PID: %d, dump:\n", mCameraId, (getRemoteCallback() != NULL ? |