summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.h
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/CameraService.h
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/CameraService.h')
-rw-r--r--services/camera/libcameraservice/CameraService.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index ce026b9..ee4c3f9 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -91,6 +91,9 @@ public:
// Default number of messages to store in eviction log
static const size_t DEFAULT_EVENT_LOG_LENGTH = 100;
+ // Event log ID
+ static const int SN_EVENT_LOG_ID = 0x534e4554;
+
// Implementation of BinderService<T>
static char const* getServiceName() { return "media.camera"; }
@@ -205,7 +208,10 @@ public:
return mRemoteBinder;
}
- virtual status_t dump(int fd, const Vector<String16>& args) = 0;
+ // Disallows dumping over binder interface
+ virtual status_t dump(int fd, const Vector<String16>& args);
+ // Internal dump method to be called by CameraService
+ virtual status_t dumpClient(int fd, const Vector<String16>& args) = 0;
// Return the package name for this client
virtual String16 getPackageName() const;