Camera: Fix a link error for CameraSessionStats
Test: Build
Bug: 173735764
Bug: 173723548
Change-Id: Ifc05081fcecc4e6bcecf79900c4271519e4315c1
diff --git a/camera/CameraSessionStats.cpp b/camera/CameraSessionStats.cpp
index 4c23982..818b4d0 100644
--- a/camera/CameraSessionStats.cpp
+++ b/camera/CameraSessionStats.cpp
@@ -169,6 +169,18 @@
return OK;
}
+const int CameraSessionStats::CAMERA_STATE_OPEN = 0;
+const int CameraSessionStats::CAMERA_STATE_ACTIVE = 1;
+const int CameraSessionStats::CAMERA_STATE_IDLE = 2;
+const int CameraSessionStats::CAMERA_STATE_CLOSED = 3;
+
+const int CameraSessionStats::CAMERA_FACING_BACK = 0;
+const int CameraSessionStats::CAMERA_FACING_FRONT = 1;
+const int CameraSessionStats::CAMERA_FACING_EXTERNAL = 2;
+
+const int CameraSessionStats::CAMERA_API_LEVEL_1 = 1;
+const int CameraSessionStats::CAMERA_API_LEVEL_2 = 2;
+
CameraSessionStats::CameraSessionStats() :
mFacing(CAMERA_FACING_BACK),
mNewCameraState(CAMERA_STATE_CLOSED),
diff --git a/camera/include/camera/CameraSessionStats.h b/camera/include/camera/CameraSessionStats.h
index 57c2645..27a756f 100644
--- a/camera/include/camera/CameraSessionStats.h
+++ b/camera/include/camera/CameraSessionStats.h
@@ -69,23 +69,23 @@
/**
* Values for notifyCameraState newCameraState
*/
- static const int CAMERA_STATE_OPEN = 0;
- static const int CAMERA_STATE_ACTIVE = 1;
- static const int CAMERA_STATE_IDLE = 2;
- static const int CAMERA_STATE_CLOSED = 3;
+ static const int CAMERA_STATE_OPEN;
+ static const int CAMERA_STATE_ACTIVE;
+ static const int CAMERA_STATE_IDLE;
+ static const int CAMERA_STATE_CLOSED;
/**
* Values for notifyCameraState facing
*/
- static const int CAMERA_FACING_BACK = 0;
- static const int CAMERA_FACING_FRONT = 1;
- static const int CAMERA_FACING_EXTERNAL = 2;
+ static const int CAMERA_FACING_BACK;
+ static const int CAMERA_FACING_FRONT;
+ static const int CAMERA_FACING_EXTERNAL;
/**
* Values for notifyCameraState api level
*/
- static const int CAMERA_API_LEVEL_1 = 1;
- static const int CAMERA_API_LEVEL_2 = 2;
+ static const int CAMERA_API_LEVEL_1;
+ static const int CAMERA_API_LEVEL_2;
String16 mCameraId;
int mFacing;