summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1/CameraClient.cpp
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:20 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-03-07 18:12:20 -0800
commitedd6ca3e244dda4687da86bc614a2bb709b3a963 (patch)
tree4efd0f4664f7f5e88434844c2eb70cdff4aab5d1 /services/camera/libcameraservice/api1/CameraClient.cpp
parent808632f7bf0a897fb55cc38170ad6c1b2fd86ba2 (diff)
parent38f1da3889188fb3beeaf7fdfeb92b4444c9fb4b (diff)
downloadframeworks_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/CameraClient.cpp')
-rw-r--r--services/camera/libcameraservice/api1/CameraClient.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index af0d680..55555fd 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -111,6 +111,10 @@ CameraClient::~CameraClient() {
}
status_t CameraClient::dump(int fd, const Vector<String16>& args) {
+ return BasicClient::dump(fd, args);
+}
+
+status_t CameraClient::dumpClient(int fd, const Vector<String16>& args) {
const size_t SIZE = 256;
char buffer[SIZE];