summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* CaptureUI: handle secure capture when reviewing picturesAlexander Martinz2020-06-011-4/+11
| | | | | | Test: run cts --skip-preconditions -m CtsProviderUiTestCases -t android.providerui.cts.MediaStoreUiTest#testImageCaptureWithInadequeteLocationPermissions Change-Id: I492103ff68036f4c3474d4172a3ba31ab19efe1b Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
* Snap: Add back SCENE_MODE_HDR_INT definitionMichael Bestas2020-03-141-0/+1
| | | | | | This partially reverts commit 4fbfaff93c9abd0825453c7b91c1528a38bd4564. Change-Id: Id94048813862ee43941295d64ee7d31fe3bfb6e4
* Merge tag 'LA.UM.8.1.r1-14300-sm8150.0' of ↵Michael Bestas2020-03-119-40/+170
|\ | | | | | | | | | | | | | | | | | | | | | | https://source.codeaurora.org/quic/la/platform/packages/apps/SnapdragonCamera into lineage-17.1 "LA.UM.8.1.r1-14300-sm8150.0" Conflicts: src/com/android/camera/CameraHolder.java src/com/android/camera/CaptureModule.java Change-Id: Ifc0f89fcc36e8ce225cda91b1e6fe8c44e9bee29
| * SnapdraongCamera: cct mode wb is errorjiaoyuan2020-01-111-0/+1
| | | | | | | | | | | | | | when cct mode, should set CONTROL_AWB_MODE_OFF to CONTROL_AWB_MODE, then the wb will show Manual. Change-Id: Idb37e11f140181683ea72b58af50c31edb9abae2
| * SnapdragonCamera: Enable CAF function when HDR mode is ON.xianming wang2020-01-111-1/+2
| | | | | | | | | | | | Enable CAF function when HDR mode is ON. Change-Id: I8a75c9b6fd5392d2385f40fccc7eae05a23a75d5
| * SnapdraongCamera:Support GTS intentjunjiez2020-01-111-1/+2
| | | | | | | | | | | | | | | | Get extra parameter from GTS intent to check if need to open front camera. Change-Id: Ide3d004ceb3626a246a45f9ec18db454628a6542 CRs-Fixed: 2581193
| * Merge "Fix issue of updating Flash in HFR" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2020-01-011-5/+4
| |\
| | * Fix issue of updating Flash in HFRjinwu2019-11-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't allow to change requests batch in high speed session, so when update flash mode in HFR, it should still send preview and video requests together. Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594
| * | Merge "SnapdragonCamera: Fix NP on monkey case" into ↵Camera Software Integration2020-01-011-1/+4
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdragonCamera: Fix NP on monkey casexianming wang2019-11-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix NP on monkey case. Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257
| * | | SnapdraongCamera: disable color filter when enable mfnrjiaoyuan2019-12-022-1/+4
| |/ / | | | | | | | | | | | | | | | Color filter menu shoud be disabled when enable MFNR in front camera Change-Id: I41689623f5221a14938deb5e65f55e91ae41bdc2
| * | Merge "SnapdraongCamera: set mLongshoting false" into ↵Camera Software Integration2019-11-281-0/+2
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdraongCamera: set mLongshoting falsejiaoyuan2019-11-071-0/+2
| | |/ | | | | | | | | | | | | | | | set mLongshoting false when long capture finish Change-Id: If64153b17976552917ef82f04ba9baab4aaf61ee
| * | Merge "SnapdraongCamera:Disable HEIF when SelfieMirror" into ↵Camera Software Integration2019-11-281-0/+30
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdraongCamera:Disable HEIF when SelfieMirrorjunjiez2019-11-111-0/+30
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | SelfieMirror need to use app-zsl,but app-zsl is not supported,so disable heif when SelfieMirror is enabled. Change-Id: I31a5e482a73716521dd3bacd637db4df119a508d CRs-Fixed: 2534960
| * | Merge "SnapdraongCamera: fix exception" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-281-1/+1
| |\ \
| | * | SnapdraongCamera: fix exceptionjiaoyuan2019-11-151-1/+1
| | |/ | | | | | | | | | | | | | | | | | | when onCaptureSequenceCompleted, surface is not ready, catch exception Change-Id: Ia58afe18210bdbebdaf372b52e6234652cd4db33
| * | Merge "SnapdraongCamera: hide flash icon" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-281-1/+6
| |\ \
| | * | SnapdraongCamera: hide flash iconjiaoyuan2019-11-191-1/+6
| | |/ | | | | | | | | | | | | | | | Flash icon should be hidden when SW MFNR enabled. Change-Id: I6dee92825d1b069f364a325457cf82ed9f649a68
| * | Merge "SnapdraongCamera:Fix recording pause" into ↵Linux Build Service Account2019-11-281-2/+8
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdraongCamera:Fix recording pausejunjiez2019-11-151-2/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | Catch IllegalStateException when fails to pause video recording. Change-Id: Id1c4978db58bd040dd695313bf246202fd7357c7 CRs-Fixed: 2565211
| * | Merge "SnapdragonCamera: Filter less 720P videoSize when EIS enable" into ↵Linux Build Service Account2019-11-282-22/+33
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdragonCamera: Filter less 720P videoSize when EIS enablexianming wang2019-11-152-22/+33
| | |/ | | | | | | | | | | | | | | | Filter less than 720P video quality when EIS enable. Change-Id: I9dbcccceb9e17927eb46afb3a6210621aaa8bb60
| * | Merge "SnapdraongCamera:Add shutter logs" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-11-281-0/+2
| |\ \
| | * | SnapdraongCamera:Add shutter logsjunjiez2019-11-211-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add logs for shutter button when click and release to indicate shot to shot latency Change-Id: Ie16c6341b396243164c03ecdf6f60a25023f5bef CRs-Fixed: 2515200
| * / SnapdraongCamera: hide AEB after restorejiaoyuan2019-11-222-2/+4
| |/ | | | | | | | | | | hide AEB after restore Change-Id: I5f9b6222e2f14eab7a41da04f90bb1f5b87faabe
| * Merge "SnapdragonCamera: Correct the mBackCameraId and mFrontCameraId" into ↵Camera Software Integration2019-11-061-2/+3
| |\ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * SnapdragonCamera: Correct the mBackCameraId and mFrontCameraIdxianming wang2019-10-301-2/+3
| | | | | | | | | | | | | | | | | | Correct the mBackCameraId and mFrontCameraId. Change-Id: I10904c601801c89b89f1fb21468d5c7a420bfb4a
| * | Merge "SnapdraongCamera:APP-ZSL size" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-061-1/+6
| |\ \
| | * | SnapdraongCamera:APP-ZSL sizejunjiez2019-10-291-1/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Need to get max supported size as APP-ZSL size, then crop into picture size to avoid FOV issue Change-Id: I298544d849af6ba4944826f8960e47331b4abe34 CRs-Fixed: 2545491
| * | Merge "SnapdragonCamera: Flash icon appears after countdown" into ↵Camera Software Integration2019-11-061-1/+9
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdragonCamera: Flash icon appears after countdownjiaoyuan2019-10-181-1/+9
| | |/ | | | | | | | | | | | | | | | | | | Flash icon appears after snapshot with countdown timer in ProMode Change-Id: I21101397b617e8afc433118400bb4b07ae061801
| * | Removes all usages of ScriptC_* variables.Divya Sharma2019-11-041-15/+0
| | | | | | | | | | | | Change-Id: I42386aac4e9f534637fe1a81f29c596341dc8077
| * | Merge "SnapdragonCamera: Disable MPEG4 when enable EIS and less 720P" into ↵Camera Software Integration2019-11-012-0/+26
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdragonCamera: Disable MPEG4 when enable EIS and less 720Pxianming wang2019-10-082-0/+26
| | |/ | | | | | | | | | | | | | | | | | | | | | Disable MPEG4 encoder when enable EIS and video quality less than 720P. CRs-Fixed: 2532891 Change-Id: I48c450c47b77500562aa53c31edbae5caf873a0b
| * | Merge "SnapdragonCamera: options button missing in promode" into ↵Camera Software Integration2019-11-011-0/+1
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdragonCamera: options button missing in promodejiaoyuan2019-10-171-0/+1
| | |/ | | | | | | | | | | | | | | | reset options button height Change-Id: I607c236fb6f2452f0024151027ad4afa420f54e8
| * | Merge "SnapdraongCamera:Filter HEIF size" into camera-SnapdragonCamera.lnx.2.0Camera Software Integration2019-11-011-4/+42
| |\ \
| | * | SnapdraongCamera:Filter HEIF sizejunjiez2019-10-161-4/+42
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Filter unsupported HEIF size according to the capabilities of heic encoder to avoid codec error. Change-Id: If68f517f768d04c27f1bd52def4d8fb492b74842 CRs-Fixed: 2525250
| * | Merge "SnapdraongCamera: mms do not need high speed" into ↵Camera Software Integration2019-11-011-2/+1
| |\ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| | * | SnapdraongCamera: mms do not need high speedjiaoyuan2019-10-091-2/+1
| | |/ | | | | | | | | | | | | | | | mms do not support high speed Change-Id: Id0ec90ef7ff1b09bd8045300fd58fe65133e127f
| * / SnapdragonCamera: hide navigation barjiaoyuan2019-10-101-1/+2
| |/ | | | | | | | | | | hide navigation bar Change-Id: I98c081cc4feaa7a8434bf2325c30daef98ce15ea
* | Snap: catch NumberFormatException in getDeviceSocIdJan Altensen2020-02-031-1/+2
| | | | | | | | | | | | * non qcom devices might return a non numeric value Change-Id: I6dcdab18965778053bf10291c9fa86e21d048c4f
* | Snap: Convert leftover persist.camera.* to persist.sys.camera.*Michael Bestas2020-01-122-5/+9
| | | | | | | | | | | | Avoid SELinux denials with property isolation enabled Change-Id: I10bc0a406b3702d24ccede845a05ad6eb205b062
* | Snap: Handle SDCard-removed caselineage-17.0Michael W2019-11-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * When the storage path has been set to SDCard but the card has been removed, there is currently no way to alter the setting and to get your cam to work properly again * Check the writeable-state of the sdcard on startup and fall back to using the internal storage in that case * The startup-flag is used to keep the current behaviour with removed SDcards while cam is still active * Fixes: https://gitlab.com/LineageOS/issues/android/issues/1376 Change-Id: Ib408883a6810693c93488f8a02fe061c56932d1d
* | Snap: Don't remove scene modes!dianlujitao2019-11-211-5/+1
| | | | | | | | | | | | This partially reverts commit 8acb462b46c930bf6f6c6192012a11f2e127ecc4. Change-Id: I5864924938189b17efa9a496912a51b9c2b233c1
* | Snap: Perform null check on AF state in updateCaptureStateMachinedianlujitao2019-11-211-0/+5
| | | | | | | | | | | | | | | | | | * Some camera HAL implementations don't push AF state to urgent metadata. E.g. for QCOM camera HAL this happens only after https://source.codeaurora.org/quic/la/platform/hardware/qcom/camera/commit/?h=LA.UM.7.2.r1-07700-sdm660.0&id=d276a953295364b967c36038362c1e7ea268bdad * Fix crash on capture after c724bc35a9c5f3b36ce36a2081559e2644993da4 Change-Id: I8980fd3fb7d7db4f61189281580ecb17778602df
* | Snap: Fix getting supported ISO with legacy HALdianlujitao2019-11-211-6/+21
| | | | | | | | | | | | | | | | * org.codeaurora.qcamera3.iso_exp_priority.iso_available_modes is QCOM specific vendor tag and not implemented in legacy HALs. * Restore pre-17.0 behavior by falling back to AOSP camera characteristics Change-Id: I299e7bfb867496c63ec873ea4cea29b0b8bb595f
* | Snap: Don't query camera hardware on camera button actionLuK13372019-11-111-11/+0
| | | | | | | | | | | | | | | | * Android 10 does not allow idle apps to do anything camera related so lets just launch the app unconditionally instead. Change-Id: I117b1442e5ca107205d4b69cbfd32d5375995d78
* | Fix NPE when removing RAW settingLuK13372019-11-091-1/+1
| | | | | | | | | | | | | | * That preference is already gone when developer options are disabled. Change-Id: I040d153561cce691e8e5689bb810585071cb5836