Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 943e7473 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Fix a link error for CameraSessionStats"

parents 87f5cac8 bac18d9b

camera/CameraSessionStats.cpp

+12 −0
Original line number Diff line number Diff line
@@ -169,6 +169,18 @@ status_t CameraStreamStats::writeToParcel(android::Parcel* parcel) const { 
    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),

camera/include/camera/CameraSessionStats.h

+9 −9
Original line number Diff line number Diff line
@@ -69,23 +69,23 @@ public: 
    /**

     * 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;