summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "SnapdragonCamera: Handle Camera device errors gracefully."Linux Build Service Account2015-04-061-0/+1
|\ \ | |/ |/|
| * SnapdragonCamera: Handle Camera device errors gracefully.Sai Kumar Sanagavarapu2015-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | Handle Camera device errors from lower layers gracefully by finishing the activity and there by closing camera session and app. Also, display a toast message signifying the error because of which camera app is being shutdown. Change-Id: I86c4caf174356148bd4725329ea13ec82e944b94
* | Merge "SnapdragonCamera: Correct AutoHDR callback data size check"Linux Build Service Account2015-03-271-1/+1
|\ \ | |/ |/|
| * SnapdragonCamera: Correct AutoHDR callback data size checkEmilian Peev2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the AutoHDR functionality which handles metadata callbacks always assumes that the length of the callback data buffer will be equal to 12 bytes. It will always try to read and convert 3 32-bit integers. The check before this processing is incorrect as it allows buffers which are less than 12 bytes to be processed as well. This can lead to array out of bounds exceptions, which are also possible during FD snapshot metadata callbacks that don't contain any faces. In this particular scenario the metadata callback buffer size will be 8 bytes. Change-Id: I4094aaa56aa4135d2d806861353d49c8d7f9985c CRs-Fixed: 799110
* | Merge "Snapdragon Camera: Unlock AE&AWB before snapshot"Linux Build Service Account2015-03-261-6/+7
|\ \ | |/ |/|
| * Snapdragon Camera: Unlock AE&AWB before snapshotEmilian Peev2015-03-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the application contains logic which will lock AE&AWB before snapshot if AF didn't get triggered. Unlocking happens during image capture though and will get ignored because the camera state is already set to 'SNAPSHOT_IN_PROGRESS". This sequence of events can have side effects w.r.t. flash. To avoid this AE&AWB should always be unlocked before snapshot. Change-Id: I7b1d53fdd87f7e9c1a1bb3530e4c5a87a7b05605
* | Merge "SnapdragonCamera: Add beautification feature to SnapdragonCamera."Linux Build Service Account2015-03-231-2/+86
|\ \
| * | SnapdragonCamera: Add beautification feature to SnapdragonCamera.Zhang Zhenzhen2015-03-201-2/+86
| | | | | | | | | | | | Change-Id: Ie585527fc0b8679359753b3ff6245add3d1e5530
* | | SnapdragonCamera: Fix AEC lock issue after non-zsl snapshot.Sai Kumar Sanagavarapu2015-03-201-1/+4
|/ / | | | | | | | | | | | | | | | | In non-zsl snapshot, focus manager is set to unlock AEC after setting camera parameters in startpreview(). Due to this, AEC gets unlocked only after next touch focus or any set param call. Fixed this by changing the order during startpreview(). Change-Id: I320d7b37c7107ce2242a52979505ff04029a83fa
* | Merge "SnapdragonCamera: Update the preview thumbnail after continuous shot"Linux Build Service Account2015-03-181-0/+11
|\ \
| * | SnapdragonCamera: Update the preview thumbnail after continuous shotlikaid2015-03-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | In continuous shot mode, we do not update the preview thumbnail for each snapshot, instead, update it only once at the end of shotting with the final jpeg data. Change-Id: I388fb42688992f1e4ff8d3b7243d9f564bfe777a CRs-Fixed: 795476
* | | Merge "Snapdragon Camera: Override flash mode to off during non-auto scene"Linux Build Service Account2015-03-171-5/+4
|\ \ \ | | |/ | |/|
| * | Snapdragon Camera: Override flash mode to off during non-auto sceneEmilian Peev2015-03-051-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the flash mode on application side will be set to 'auto' during scenes different from 'auto'. Due to the manual white balance modes used in these scenes it makes more sense to actually have flash mode set to off. Change-Id: Iaae2bc0d392f9dc384a68ad6390f9510eb7a65ed CRs-Fixed: 765000
* | | Merge "Snapdragon Camera: Unlock AE&AWB during longshot"Linux Build Service Account2015-03-171-0/+7
|\| |
| * | Snapdragon Camera: Unlock AE&AWB during longshotEmilian Peev2015-03-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Both AWB&AE are currently locked during longshot. This can have side effects for cases which utilize torch flash. Change-Id: I1fec80a3a869c1a71be8d724b1b8771e88411ae5 CRs-Fixed: 770028
* | | Merge "Snapdragon Camera: Avoid null pointer exception during shutter focus"Linux Build Service Account2015-03-171-2/+4
|\| |
| * | Snapdragon Camera: Avoid null pointer exception during shutter focusEmilian Peev2015-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | An additional check needs to be added for the focus manager initialization during handling of the shutter button focus event. Change-Id: Ie43a2376f42644ec493ffe1af53c9c5a1c279ec4 CRs-Fixed: 766843
* | | Merge "Camera: Avoid state switch during preview start"Linux Build Service Account2015-03-171-0/+3
|\| | | |/ |/|
| * Camera: Avoid state switch during preview startEmilian Peev2015-03-051-0/+3
| | | | | | | | | | | | | | | | | | If snapshot is running avoid changing the camera application state during handling of 'ON_PREVIEW_STARTED' messages. Change-Id: I1654752d431d41d3219f235a08f77e1d7dd10c27 CRs-Fixed: 747816
* | Camera2: Add StillMore option in Camera app menuShwetha Kotekar2015-03-101-9/+39
|/ | | | | | | Add menu item for StillMore feature under the Advanced Features item during camera preview. Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b
* SnapdragonCamera: Set longshot enable after AF done.Sai Kumar Sanagavarapu2015-02-211-1/+4
| | | | | | | | Enable longshot to backend only after AF done. This will help in storing 3A related params after AF result based on longshot enable/disable event. Change-Id: Iebdb9b324e758125704959d9a67ba0d0a6772e7a
* SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-4/+0
| | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* Merge "SnapdragonCamera: set histogram orientation"Linux Build Service Account2015-02-111-0/+3
|\
| * SnapdragonCamera: set histogram orientationLikai Ding2015-02-101-0/+3
| | | | | | | | | | | | Set histogram rotation during orientation change. Change-Id: I6f9a6fb9a1761fc3a7f926f16794f8db8b61c78c
* | Merge "SnapdragonCamera: Cover the preview until the preview really starts"Linux Build Service Account2015-02-101-0/+1
|\ \
| * | SnapdragonCamera: Cover the preview until the preview really startslikaid2015-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the surface was ready, the preview data may not come yet, that caused the desktop ui flashed in the camera when relaunching camera. Delay the occasion of dismissing preview cover until onPreviewStarted. Change-Id: I80b751bd19889683d784b94827b668efa817ff02 CRs-Fixed: 789076
* | | Merge "SnapdragonCamera: Subtract 50M when calculate the remaining photos"Linux Build Service Account2015-02-101-1/+2
|\ \ \
| * | | SnapdragonCamera: Subtract 50M when calculate the remaining photoslikaid2015-02-091-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera couldn't take a snapshot when the available storage space is less than 50M. When calculate remaining photos, didn't subtract low storage threshold bytes. Subtract low storage threshold bytes when calculate the remaining photos. Change-Id: I774442e97ef8847a731167f7ef00454642632902 CRs-Fixed: 779420
* | | Merge "SnapdragonCamera: Fix null pointer exception during monkey test"Linux Build Service Account2015-02-091-2/+7
|\ \ \
| * | | SnapdragonCamera: Fix null pointer exception during monkey testlikaid2015-02-091-2/+7
| |/ / | | | | | | | | | | | | | | | CRs-Fixed: 788421 788422 788437 788445 Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
* | | Merge "SnapdragonCamera: Update the remaining number after change save path"Linux Build Service Account2015-02-091-0/+1
|\ \ \ | |/ / |/| |
| * | SnapdragonCamera: Update the remaining number after change save pathkaiyiz2015-02-051-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | The remaining photo number wasn't update after change the save path from SD card to phone storage, that caused the left number not matched current setting. Update it in onSharedPreferenceChanged, make it matched with the current save path setting. Change-Id: I544c5baca8a30f8c7dbd8d71962300ae320e9de5 CRs-Fixed: 786966
* / SnapdragonCamera: Revert copyright year change.Sai Kumar Sanagavarapu2015-02-051-1/+1
|/ | | | | | Dont change copyright year of photomodule. Change-Id: I6b07b652d8caaa7df6931af0cab9b62d0ab41760
* Merge "SnapdragonCamera: fix portrait orientation"Linux Build Service Account2015-02-041-26/+22
|\
| * SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* | SnapdragonCamera: Disable ZSL+AE-bracketing if not supported.Sai Kumar Sanagavarapu2015-02-021-2/+5
|/ | | | | | | Use ZSL+HDR feature check to disable AE-bracketing if not supported, because HDR internally uses AE-bracketing only. Change-Id: I47abe4373e643b1a790c50ada34bd481b3ee0031
* Merge "SnapdragonCamera: Add Portrait to scene mode"Linux Build Service Account2015-01-281-185/+4
|\
| * SnapdragonCamera: Add Portrait to scene modeByunghun Jeon2015-01-261-185/+4
| | | | | | | | | | | | | | Add portrait option to scene mode Change-Id: I5c29e896734eab25e8f21adb142006081ea1c851 CRs-Fixed: 777753
* | Merge "SnapdragonCamera: fix not update preview thumb in scenemode macro+"Linux Build Service Account2015-01-281-19/+4
|\ \
| * | SnapdragonCamera: fix not update preview thumb in scenemode macro+kaiyiz2015-01-221-19/+4
| |/ | | | | | | | | | | | | | | | | | | The function update preview thumb is not called in macro+ mode. Fix the logic about macro+ mode, treat 7th picture as a normal picture taken. Change-Id: Icdd8f93d3feeb09eea67a3077b5ebf82508543cc CRs-Fixed: 783720
* | Merge "SnapdragonCamera: Sync surface destruction and camera open thread."Linux Build Service Account2015-01-261-0/+8
|\ \ | |/ |/|
| * SnapdragonCamera: Sync surface destruction and camera open thread.Sai Kumar Sanagavarapu2015-01-201-0/+8
| | | | | | | | | | | | | | | | | | | | If surface gets destroyed while Camera open thread is still trying to start preview, camera app state machine will go into toss. Next time when surface gets created again, it might try to set preview surface again while previewing leading to app exception. So, sync surface destruction and camera open threads. Change-Id: I6ba4103559766c327d2bc55887a0f7df1b4b0d40
* | Merge "SnapdragonCamera: fix CalledFromWrongThreadException"Linux Build Service Account2015-01-211-1/+6
|\ \
| * | SnapdragonCamera: fix CalledFromWrongThreadExceptionLikai Ding2015-01-201-1/+6
| |/ | | | | | | | | | | | | updateRemainingPhotos() may be called from background thread. Fix it by posting to main thread. Change-Id: Iad14f0a40c10a245e3a7178f5a7f1383eca72ad8
* | Merge "SnapdragonCamera: Open camera in init for improve start preview KPIs"Linux Build Service Account2015-01-201-1/+1
|\ \ | |/ |/|
| * SnapdragonCamera: Open camera in init for improve start preview KPIskaiyiz2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When switch from VideoModule to PhotoModule, opencamera will run in onResume rather than init() and start preview must be executed after open camera.This lead to start preview slowly. Open camera when module init for run start preview as early as possible. so the flag mIsModuleSwitchInProgress isn't needed. Reference similar action in VideoModule's init(). CRs-Fixed: 741089 Change-Id: I5a8fd18ef944fbc28f1b61470a4f389d3096c8ef
* | Merge "SnapdragonCamera: implement refocus feature"Linux Build Service Account2015-01-181-11/+48
|\ \
| * | SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* | | Merge "SnapdragonCamera: Fix null pointer exception in SnapdragonCamera"Linux Build Service Account2015-01-171-5/+8
|\ \ \
| * | | SnapdragonCamera: Fix null pointer exception in SnapdragonCamerakaiyiz2015-01-151-5/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Null Pointer exception occurred in Camera during monkey test. Add null pointer check before use them. Change-Id: I992f6b8f8dc6b91947ec3e4d703b4e9b72996f67 CRs-Fixed: 780252
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-14 20:04:08 +0000