summaryrefslogtreecommitdiffstats
path: root/camera/CameraProperties.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'camera/CameraProperties.cpp')
-rw-r--r--camera/CameraProperties.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/camera/CameraProperties.cpp b/camera/CameraProperties.cpp
index c0a1934..93bc953 100644
--- a/camera/CameraProperties.cpp
+++ b/camera/CameraProperties.cpp
@@ -26,7 +26,8 @@
#define CAMERA_ROOT "CameraRoot"
#define CAMERA_INSTANCE "CameraInstance"
-namespace android {
+namespace Ti {
+namespace Camera {
// lower entries have higher priority
static const char* g_camera_adapters[] = {
@@ -67,7 +68,7 @@ status_t CameraProperties::initialize()
status_t ret;
- Mutex::Autolock lock(mLock);
+ android::AutoMutex lock(mLock);
if(mInitialized)
return NO_ERROR;
@@ -130,4 +131,5 @@ int CameraProperties::camerasSupported()
return mCamerasSupported;
}
-};
+} // namespace Camera
+} // namespace Ti