summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "SnapdragonCamera: onCaptureCompleted will return when mPaused=true" ↵Camera Software Integration2020-05-181-0/+3
|\ | | | | | | into camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera: onCaptureCompleted will return when mPaused=truexianming wang2020-05-121-0/+3
| | | | | | | | | | | | onCaptureCompleted will return when mPaused=true. Change-Id: I735178dd1a9f482f1616179f7c233f64436fa8a8
* | Merge "SnapdragonCamera: Try/catch abortCaptures not include close" into ↵Camera Software Integration2020-05-181-3/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Try/catch abortCaptures not include closexianming wang2020-05-111-3/+1
| |/ | | | | | | | | | | Try/catch abortCaptures not include close method. Change-Id: I028b6c41a2bb4bed4ffaf3ab5a4eb87584446090
* | Merge "lock af/ae after zoom" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-05-181-0/+14
|\ \
| * | lock af/ae after zoomjiaoyuan2020-05-111-0/+14
| |/ | | | | | | | | | | lock af/ae after zoom Change-Id: Ibc7244557ce6ce7cfc1b6d1a29d6809a82e0132e
* | Merge "use setRepeatingBurst when high speed capture" into ↵Camera Software Integration2020-05-181-2/+11
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | use setRepeatingBurst when high speed capturejiaoyuan2020-05-111-2/+11
| |/ | | | | | | | | | | | | use setRepeatingBurst instead of setRepeatingRequest when high speed capture Change-Id: I5cc8be2d72bc589c3c346e424db09919291e4f61
* | Merge "SnapdragonCamera: Enable CAF function when HDR mode is ON" into ↵Camera Software Integration2020-05-181-1/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Enable CAF function when HDR mode is ONxianming wang2020-05-111-1/+2
| |/ | | | | | | | | | | Enable CAF function when HDR mode is ON. Change-Id: Ic4109748db33ccd50e99d71dc3830651675f523b
* | Merge "SnapdragonCamera: Session Parameters" into ↵Camera Software Integration2020-05-181-12/+28
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Session Parametersjunjiez2020-04-301-12/+28
| |/ | | | | | | | | | | | | | | Apply session parameters after create new capture request to avoid framework reconfigure stream. Change-Id: I50726b01f1771bbb6bb428aa80d7fb8dfc0a91f1
* | Merge "SnapdragonCamera: ReModify CURRENT_ID = 0 on init method" into ↵Camera Software Integration2020-05-141-0/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: ReModify CURRENT_ID = 0 on init methodxianming wang2020-04-281-0/+1
| |/ | | | | | | | | | | ReModify CURRENT_ID = 0 on init method. Change-Id: Ia8011781da36480ad125b56551bf12b4ff232b6a
* / SnapdragonCamera: RestartSession didn`t close ImageReaderxianming wang2020-04-281-46/+72
|/ | | | | | RestartSession didn`t close ImageReader. Change-Id: I0a5661b9e5d2738cd093c492b583449dd7f33563
* Merge "SnapdragonCamera:[FR61457] Add Zoom seekbar on ProMode" into ↵Camera Software Integration2020-04-191-0/+7
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera:[FR61457] Add Zoom seekbar on ProModexianming wang2020-04-151-0/+7
| | | | | | | | | | | | [FR61457] Add Zoom seekbar on ProMode. Change-Id: I7a77d590c2690c96489dfa27476249ff8d89ccee
* | Merge "Fix camera device is not closed in stability test" into ↵Camera Software Integration2020-04-161-8/+12
|\ \ | |/ |/| | | camera-SnapdragonCamera.lnx.3.1
| * Fix camera device is not closed in stability testjinwu2020-04-131-8/+12
| | | | | | | | | | | | | | Make sure session illegalstate exception does not bypass close camera. Change-Id: I5ebd3e6a799aa1a3a49ae16b85d5b3aacfbfece6
* | disible MFNR+Flash when swmfnrjiaoyuan2020-04-141-0/+9
| | | | | | | | | | | | disable MFNR+Flash combination when swmfnr Change-Id: Ia74266151c0631115d8565d4e0f7264fa79b3115
* | Merge "snapcam: long press for lock AE/AF" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-04-141-27/+134
|\ \ | |/ |/|
| * snapcam: long press for lock AE/AFjiaoyuan2020-04-091-28/+135
| | | | | | | | | | | | long press for lock AE/AF Change-Id: I169a56e588b870188bcf62af02ed0a1021fa8fcb
* | Merge "SnapdragonCamera: Close ImageReader after stopBackgroundThread" into ↵Camera Software Integration2020-04-131-15/+14
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Close ImageReader after stopBackgroundThreadxianming wang2020-04-081-15/+14
| | | | | | | | | | | | | | | | | | | | | Close ImageReader after stoprBackgroundThread. CRs-Fixed: 2645642 Change-Id: If1f8658f7f1b7f1676301bcdc71383be844ede10
* | | Merge "SnapdragonCamera: Correct right next camera scene mode" into ↵Camera Software Integration2020-04-131-12/+37
|\ \ \ | | |/ | |/| | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Correct right next camera scene modexianming wang2020-04-071-12/+37
| |/ | | | | | | | | | | Correct right next camera scene mode and cameraID. Change-Id: I14aa588855a16584feb2bf8e38fb410bbd3445fb
* / set mLongshoting to false in single capturejiaoyuan2020-04-071-0/+1
|/ | | | | | set mLongshoting to false in single capture if mLongshoting is true Change-Id: I4fe4376f5bd422ef2d2b5c1397288853556a9fe4
* Merge "SnapdragonCamera: Send capture request before call abortCaptures" ↵Camera Software Integration2020-04-011-2/+14
|\ | | | | | | into camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera: Send capture request before call abortCapturesxianming wang2020-03-261-2/+14
| | | | | | | | | | | | | | Send capture request before call abortCaptrues. CRs-Fixed: 2640405 Change-Id: I859c77d7bf96706a22ee8f6805986479de29ea4d
* | Merge "enable video button until session is created" into ↵Camera Software Integration2020-03-301-1/+14
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | enable video button until session is createdjiaoyuan2020-03-231-1/+14
| | | | | | | | | | | | | | | | | | | | | enable video button until session is created not setUpMediaRecorder Change-Id: I4f5df16814ce7d815ae52a458d3b46a5f9679bbe
* | | Merge "SnapdragonCamera: Add wait preview surface ready 2s" into ↵Camera Software Integration2020-03-301-0/+8
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | | SnapdragonCamera: Add wait preview surface ready 2sxianming wang2020-03-201-0/+8
| |/ / | | | | | | | | | | | | | | | Add wait preview surface ready 2s. Change-Id: I0192ab2931049e0f47e26662045a3b2e2863394c
* | | Merge "SnapdragonCamera: Heic enable/disable" into ↵Camera Software Integration2020-03-301-0/+3
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | | SnapdragonCamera: Heic enable/disablejunjiez2020-03-261-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | Read value of vendor tag to enable/disable HEIF format. Change-Id: I81fb6d5b2d693530a362efd9bd9cea2c84f27ff5 CRs-Fixed: 2642341
* | | Merge "Fix FC of prepareMediaRecorder" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-03-301-2/+2
|\ \ \
| * | | Fix FC of prepareMediaRecorderjinwu2020-03-231-2/+2
| | |/ | |/| | | | | | | | | | | | | Throw IOException will be catched and pop-up a tip. Change-Id: If7c6127f27525d080bf678d3e383c3c719f7f12a
* | | Merge "Make unlockFocus and enableShutter synchronized" into ↵Camera Software Integration2020-03-301-9/+8
|\ \ \ | |_|/ |/| | | | | camera-SnapdragonCamera.lnx.3.1
| * | Make unlockFocus and enableShutter synchronizedjinwu2020-03-201-9/+8
| |/ | | | | | | Change-Id: I5793d6ef08a92d9f8510189366b4e3032e81b73c
* | Merge "SnapdragonCamera: Set mIsPreviewingVideo true when LOW STORAGE" into ↵Camera Software Integration2020-03-231-0/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Set mIsPreviewingVideo true when LOW STORAGExianming wang2020-03-161-0/+1
| |/ | | | | | | | | | | | | Set mIsPreviewingVideo is true when LOW STORAGE. CRs-Fixed: 2634560 Change-Id: I1d3138087cd173f5c7252ed497bea4a84d95fefe
* | Merge "SnapdragonCamera: Set AEMode/FlashMode/AETrigger in single frame" ↵Camera Software Integration2020-03-231-33/+5
|\ \ | | | | | | | | | into camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Set AEMode/FlashMode/AETrigger in single framexianming wang2020-03-161-33/+5
| |/ | | | | | | | | | | Set AEMode/FlashMode/AETrigger/AFTrigger in single frame for longshot. Change-Id: I40acce094850a1f3df913f19d390d84d245b45a3
* | Merge "snapcam: restore cameraIds" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-03-231-0/+6
|\ \
| * | snapcam: restore cameraIdsjiaoyuan2020-03-171-0/+6
| |/ | | | | | | | | | | restore cameraIds when do restore in setting Change-Id: I21bda987650248d4526b86d3fb15dbd1ec62abb9
* / Fix issue of config video stream in photo modejinwu2020-03-171-11/+10
|/ | | | Change-Id: I11ea8bdf9036524c500d2a6e4a00b0935308bbe6
* Merge "SnapdragonCamera: Add T2T supported vendorTag" into ↵Linux Build Service Account2020-03-161-3/+3
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera: Add T2T supported vendorTagxianming wang2020-03-061-3/+3
| | | | | | | | | | | | Add T2T supported vendorTag. Change-Id: I914ca87baab3749d19387ca7cec22fe2308df884
* | Merge "SnapdragonCamera: Session earlyPCR" into camera-SnapdragonCamera.lnx.3.1Linux Build Service Account2020-03-161-15/+18
|\ \
| * | SnapdragonCamera: Session earlyPCRjunjiez2020-03-111-15/+18
| |/ | | | | | | | | | | | | Set earlyPCR to true by default when create sessions. Change-Id: Ifded2990ef0e8b9bcb1e7419b25aa89550a21084