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

Commit ff10113d authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 17a80081: Merge change 5544 into donut 

Merge commit '17a80081a42410f541a220ab7e6afc64fc6cc399'

* commit '17a80081a42410f541a220ab7e6afc64fc6cc399':
  Pipe all the camera callbacks to Java to facilitate the addition
parents b9c8a734 5579a652

include/ui/Camera.h

+3 −7
Original line number Diff line number Diff line
@@ -63,16 +63,12 @@ namespace android { 
#define FRAME_CALLBACK_FLAG_CAMERA                   0x05

#define FRAME_CALLBACK_FLAG_BARCODE_SCANNER          0x07



// msgType in notifyCallback function

// msgType in notifyCallback and dataCallback functions

enum {

    CAMERA_MSG_ERROR,

    CAMERA_MSG_ERROR = 0,

    CAMERA_MSG_SHUTTER,

    CAMERA_MSG_FOCUS,

    CAMERA_MSG_ZOOM

};



// msgType in dataCallback function

enum {

    CAMERA_MSG_ZOOM,

    CAMERA_MSG_PREVIEW_FRAME,

    CAMERA_MSG_VIDEO_FRAME,

    CAMERA_MSG_POSTVIEW_FRAME,