summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "SnapdraongCamera:Fix shutter disable" into ↵Linux Build Service Account2020-03-131-8/+8
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdraongCamera:Fix shutter disablejunjiez2020-03-041-8/+8
| |/ | | | | | | | | | | | | | | | | When HDR,MFNR or QCFA is enabled or capture fail but it's not taking picture, relase the shutter button to avoid can't capture. Change-Id: I7e2bf0b6f8274540a228e552a646498e3923f525 CRs-Fixed: 2576164
* / SnapdragonCamera: Use applyVideoFlash when TAF triggerxianming wang2020-03-051-12/+22
|/ | | | | | | Use applyVideoFlash when TAF trigger. CRs-Fixed: 2620603 Change-Id: Ib86f68c1ebfd4cf10a66c159cfd8f02b5c693335
* SnapdragonCamera: add flush functionjiaoyuan2020-03-041-1/+1
| | | | | | flush function must be after mIsCloseCamera Change-Id: Ic642b85253f09a16d78a896f1ec0cacffb1528d1
* Merge "Revert "SnapdragonCamera: Update video Flash when TAF trigger"" into ↵Camera Software Integration2020-03-041-4/+7
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * Revert "SnapdragonCamera: Update video Flash when TAF trigger"mingwax2020-03-041-4/+7
| | | | | | | | | | | | This reverts commits 42853dd9426ae095632d45b7ac9f679fef17a31f. Change-Id: I63381a5b7281ed59d0b3d9e929582a002c0a0c94
* | Merge "SnapdragonCamera: Remove restartSession when app-ZSL" into ↵Camera Software Integration2020-03-041-4/+0
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Remove restartSession when app-ZSLxianming wang2020-03-021-4/+0
| |/ | | | | | | | | | | | | | | Remove restartSession when app-ZSL mode to avoid reconfigure stream. CRs-Fixed: 2620290 Change-Id: I7c32687dcb6bda5ab693eb1682d008dce10b151f
* | Merge "SnapdraongCamera:Support GTS intent" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-03-041-4/+11
|\ \
| * | SnapdraongCamera:Support GTS intentjunjiez2020-03-031-4/+11
| |/ | | | | | | | | | | | | | | Get extra parameter from GTS intent to check if need to open front camera. Change-Id: I5803e2460f195524cbf139842f6e433e0a7321b4 CRs-Fixed: 2581193
* | Merge "SnapdragonCamera: Don't close camera when switch modes" into ↵Camera Software Integration2020-03-041-22/+56
|\ \ | |/ |/| | | camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera: Don't close camera when switch modesjiaoyuan2020-02-261-22/+56
| | | | | | | | | | | | Don't close camera when switch modes. Change-Id: I617fb5e847d3b917b76bc0b55404279f39942310
* | Merge "SnapdragonCamera: Wait AE_PRECAPTURE when TAF on BurstShot" into ↵Camera Software Integration2020-03-021-19/+15
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Wait AE_PRECAPTURE when TAF on BurstShotxianming wang2020-02-261-19/+15
| |/ | | | | | | | | | | Wait AE_PRECAPTURE when TAF on BurstShot. Change-Id: I6ea6a1f6aa0aafffb9ee680434231887564f0450
* | Merge "SnapdragonCamera: Update video Flash when TAF trigger" into ↵Camera Software Integration2020-03-021-7/+4
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Update video Flash when TAF triggerxianming wang2020-02-261-7/+4
| |/ | | | | | | | | | | | | Update video flash operation when TAF trigger. CRs-Fixed: 2620603 Change-Id: I8cf1420943d160687589aa09418a84bb9893ebd7
* | Merge "Snapcam: enable shutter button when capture fail" into ↵Camera Software Integration2020-03-021-0/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | Snapcam: enable shutter button when capture failjiaoyuan2020-02-251-0/+1
| |/ | | | | | | | | | | enable shutter button when capture fail Change-Id: I60f022b09cede4cc501d3b88928538943189d69c
* / Snapcam: before setRepeatingRequest check sessionjiaoyuan2020-02-261-0/+3
|/ | | | | | before setRepeatingRequest check session is null Change-Id: Iab65f8995023bce3adc4ac7d4f7ad3dd483c3d44
* Merge "SnapdraongCamera:Control FD Rendering" into ↵Camera Software Integration2020-02-241-10/+15
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * SnapdraongCamera:Control FD Renderingjunjiez2020-02-181-10/+15
| | | | | | | | | | | | | | Read valut of vendo tag to enable or disable FD rendering in preview. Change-Id: Iffdb25f2dab0c0f7cadf6fef08c8e1ffaff7631d
* | Merge "SnapdragonCamera: Catch IllegalStateException for session closed" ↵Camera Software Integration2020-02-241-2/+2
|\ \ | | | | | | | | | into camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Catch IllegalStateException for session closedxianming wang2020-02-171-2/+2
| |/ | | | | | | | | | | Catch IllegalStateException for cameraSession has been closed. Change-Id: I67fa7c610d4257521640e243998ce0696311d7cd
* | Merge "SnapdragonCamera: Catch UnsupportedOperationException" into ↵Camera Software Integration2020-02-241-10/+15
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | SnapdragonCamera: Catch UnsupportedOperationExceptionxianming wang2020-02-141-10/+15
| |/ | | | | | | | | | | | | | | Catch UnsupportedOperationException when MediaRecorder surface died. CRs-Fixed: 2621321 Change-Id: Ia1538b965c9265e268b36333cdfcd61bed702184
* | Merge "update mfnr value before color filter" into ↵Camera Software Integration2020-02-241-1/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | update mfnr value before color filterjiaoyuan2020-02-191-1/+1
| |/ | | | | | | | | | | | | updateMFNRText must before showRelatedIcons mFilterModeSwitcher based on mfnr value. Change-Id: I61f092c29b40294ce7a10a48c0877d18afa19dff
* | Merge "SnapdraongCamera:Fix videoPreview" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-02-241-4/+0
|\ \
| * | SnapdraongCamera:Fix videoPreviewjunjiez2020-02-121-4/+0
| |/ | | | | | | | | | | | | | | Read max video preview size from vendor tag and limit preview size in video mode. Change-Id: Ifee3bf4442d0e7ba359b025cd1b254fb79a23c38 CRs-Fixed: 2607179
* / Snapcam: new method to calculate fpsjiaoyuan2020-02-201-15/+6
|/ | | | | | new method to calculate fps Change-Id: I49536ae6479919355902208c48c3fb79ed58b258
* SnapdragonCamera: Save AWB r/g/b xml for right XMLxianming wang2020-02-071-2/+4
| | | | | | Save AWB r/g/b xml for right XML. Change-Id: I07c3c19c98f1343af3a0d83c3ee5933d72031af9
* Merge "SnapdraongCamera:Disable HFR liveshot" into ↵Camera Software Integration2020-01-251-7/+0
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * SnapdraongCamera:Disable HFR liveshotjunjiez2020-01-221-7/+0
| | | | | | | | | | | | | | Disable shutter button when it's in HFR mode Change-Id: Id98bf692c62eb72b595ffe8e0911e43ac50ffb7d
* | SnapdraongCamera:Video Preview FPSjunjiez2020-01-221-1/+4
|/ | | | | | | | Read max preview FPS from vendor tag and limit preview FPS in video mode. CRs-Fixed: 2568510 Change-Id: I1ace35b0551d803f83c99cd3cc93e6b51dbd46a8
* Merge "SnapdragonCamera: Update mLastT2tTrackState when value is diff" into ↵Camera Software Integration2020-01-211-5/+6
|\ | | | | | | camera-SnapdragonCamera.lnx.3.1
| * SnapdragonCamera: Update mLastT2tTrackState when value is diffxianming wang2020-01-181-5/+6
| | | | | | | | | | | | Update mLastT2tTrackState when these values is diff. Change-Id: I46c203de98ff3f433a679e6a79661b80f7c5fb21
* | Merge "check Selfie Flash before continuous shot" into ↵Camera Software Integration2020-01-211-1/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | check Selfie Flash before continuous shotjiaoyuan2020-01-161-1/+1
| | | | | | | | | | | | | | | | | | check Selfie Flash before continuous shot Change-Id: I9eb00d9b353eed9c74bde6ac093bda6f02521ed5
* | | Merge "cancel count down if has it" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-01-211-0/+1
|\ \ \
| * | | cancel count down if has itjiaoyuan2020-01-161-0/+1
| |/ / | | | | | | | | | | | | | | | | | | cancel and do not send new if already has count down. Change-Id: I53bc60849035bfdd9d299a12276e0f7cfe54c969
* | | Merge "update zoombar after mode change" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-01-211-3/+3
|\ \ \
| * | | update zoombar after mode changejiaoyuan2020-01-161-3/+3
| |/ / | | | | | | | | | | | | | | | update zoombar after change mode Change-Id: Id45b264d4e79631963d8fbb40a6c76c357eb66bc
* | | Merge "SnapdraongCamera:Storage not enough" into camera-SnapdragonCamera.lnx.3.1Camera Software Integration2020-01-211-1/+2
|\ \ \
| * | | SnapdraongCamera:Storage not enoughjunjiez2020-01-181-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When recording failure caused by not enough storage, not need to release MediaRecorder. Change-Id: Ifbead3880374875670b8326368429c85060789de CRs-Fixed: 2549731
* | | Merge "SnapdragonCamera: Set AF_TRIGGER is cancel state" into ↵Camera Software Integration2020-01-211-6/+53
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
| * | | SnapdragonCamera: Set AF_TRIGGER is cancel statexianming wang2020-01-181-6/+53
| |/ / | | | | | | | | | | | | | | | | | | Set AF_TRIGGER is CANCEL and set AE mode is 3(AE_MODE_ON_ALWAYS_FLASH) and set FLASH mode is 1(SINGLE). Change-Id: Ib9d8ac615e40e73b56655263bf52774ce09924ab
* | | Merge "SnapdraongCamera:Add trace" into camera-SnapdragonCamera.lnx.3.1Linux Build Service Account2020-01-211-0/+21
|\ \ \
| * | | SnapdraongCamera:Add tracejunjiez2020-01-181-0/+21
| |/ / | | | | | | | | | | | | | | | | | | Add trace in app and enable it by set property. Change-Id: Ief196d9f425e1bbad739ceefbe73f514d45e63e2
* / / SnapdraongCamera:Fix Stats viewsjunjiez2020-01-181-1/+3
|/ / | | | | | | | | | | | | | | | | When swith from photo mode to other mode, stats info will be null, need to hide stats views. Change-Id: I5b39a3646dad1037dea91bc2aeb498a505d69106 CRs-Fixed: 2593822
* | Merge "Catch exception for unsupported configuration(HDR10 + 120FPS)" into ↵Camera Software Integration2020-01-171-1/+5
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.1
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 00:02:36 +0000