summaryrefslogtreecommitdiffstats
path: root/camera/ICameraClient.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-12-17 16:50:35 -0800
committerEino-Ville Talvala <etalvala@google.com>2016-03-02 10:27:36 -0800
commitd56db1d2bee182d1851097a9c712712fc094d117 (patch)
tree243fda59e2b4d51491af628b49b3a35b267e0051 /camera/ICameraClient.cpp
parentcf7913e2389a5e850e01aa6f905d252ee54c9891 (diff)
downloadframeworks_av-d56db1d2bee182d1851097a9c712712fc094d117.tar.gz
frameworks_av-d56db1d2bee182d1851097a9c712712fc094d117.tar.bz2
frameworks_av-d56db1d2bee182d1851097a9c712712fc094d117.zip
Camera: Switch camera2 to auto-gen C++ binder interfaces
- Move camera service AIDL files to frameworks/av - Build C++ interface stubs with AIDL tools - Add necessary native-side parcelables and update existing ones - Remove manually-written stubs, rearrange remaining manual stubs - Adjust implementations to work with auto-generated stubs - Adjust method signatures for auto-gen differences - Add rich error messages using binder::Status Bug: 25091611 Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
Diffstat (limited to 'camera/ICameraClient.cpp')
-rw-r--r--camera/ICameraClient.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/camera/ICameraClient.cpp b/camera/ICameraClient.cpp
index 4282f9a866..d058138216 100644
--- a/camera/ICameraClient.cpp
+++ b/camera/ICameraClient.cpp
@@ -21,10 +21,11 @@
#include <stdint.h>
#include <sys/types.h>
#include <camera/CameraUtils.h>
-#include <camera/ICameraClient.h>
+#include <android/hardware/ICameraClient.h>
#include <media/hardware/HardwareAPI.h>
namespace android {
+namespace hardware {
enum {
NOTIFY_CALLBACK = IBinder::FIRST_CALL_TRANSACTION,
@@ -150,5 +151,5 @@ status_t BnCameraClient::onTransact(
// ----------------------------------------------------------------------------
-}; // namespace android
-
+} // namespace hardware
+} // namespace android