summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * SnapdragonCamera: Fix HDR+nHDR generates dark imagesjunjiez2017-01-191-1/+2
| | | | | | | | | | | | | | | | When enable HDR+nHDR, need to restart sessions to make it work and disable ZSL when HDR is enabled. Change-Id: Idb78ff8e033df7bc9ef607ad4520ee8234203e95 CRs-Fixed: 1109804
* | Merge "SnapdragonCamera:Fix photo reversed when enable selfie Mirror" into ↵Linux Build Service Account2017-01-301-1/+2
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix photo reversed when enable selfie Mirrormingwax2017-01-191-1/+2
| |/ | | | | | | | | | | | | | | | | When camera is open front camer, and is in horizontal screen mode enable Selfie Mirror, set the image rotation angle of 180 degrees, to ensure the picture is right direction. CRs-Fixed: 1112749 Change-Id: I9b53804b7897f174c537693ff59db96df858e71d
* / SnapdragonCamera: enable histogram for front camerajunjiez2017-01-181-9/+8
|/ | | | | | | | enable histogram for front camera, allow both cameras to set histogram key. Change-Id: I23cbcec81dd1c3149ee361e2d726683b6ecc5394 CRs-Fixed: 1109689
* Merge "SnapdragonCamera:Fix [FR35432] BestPicture function lost." into ↵Camera Software Integration2017-01-171-7/+9
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Fix [FR35432] BestPicture function lost.pezhan2017-01-111-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
* | Merge "SnapdragonCamera: Fix compile error on Android M" into ↵Camera Software Integration2017-01-171-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix compile error on Android Mjunjiez2017-01-101-1/+1
| |/ | | | | | | | | | | | | | | Declare jpegData as a final variable to avoid complie error on Android M. Change-Id: Ic5048525657f5f0cf54c0154f6043b5166adbb92 CRs-Fixed: 1095457
* | Merge "SnapdragonCamera: Dualcamera mode disable ZSL" into ↵Camera Software Integration2017-01-171-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Dualcamera mode disable ZSLqimengp2017-01-111-1/+1
| |/ | | | | | | | | | | | | Dualcamera mode disable ZSL Change-Id: Ia834bfcec69bba0965757ccf401d1cccacf06a29 CRs-Fixed: 1110019
* | Merge "SnapdragonCamera:Fix start RefocusActivity when not in ↵Camera Software Integration2017-01-171-0/+4
|\ \ | | | | | | | | | UbiFocusMode" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix start RefocusActivity when not in UbiFocusModemingwax2017-01-091-0/+4
| |/ | | | | | | | | | | | | | | When the user set the mode is not UbiFocusMode, set the mIsRefocus value is false, ensure start the gallery, not the RefocusActivity. CRs-Fixed: 1106861 Change-Id: I4c766a0da00219d4fa99f2bcd05a3f33f41d02b1
* | Merge "SnapdragonCamera: Fix crash during UI stress test" into ↵Linux Build Service Account2017-01-121-0/+2
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix crash during UI stress testjuwei2017-01-051-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | CaptureModule and CaptureUI have register listeners in SettingsManager, but forget unregiseter when UI destroy. This makes the too many RenderNode objects exist and never GC. At last, the weak reference of RenderNode at native layer exceed the 51200 limitation and crash. Unregister the listener of SettingsManager will fix it. Change-Id: I881b47f8f062c366e028db59a8cf6983c1d99f5a CRs-Fixed: 1103907
* / SnapdragonCamera:Add Raw capture to developer optionjunjiez2017-01-061-24/+68
|/ | | | | | | | Add raving as Raw option to the developer options, and save both JPEG and RAW data when it't turned on Change-Id: Id2462d0bacc3f2acdf3610b2ca8054079dc40b85 CRs-Fixed: 1087490
* Merge "SnapdragonCamera: Add features to developer option" into ↵Linux Build Service Account2017-01-051-1/+279
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add features to developer optionweijiew2016-12-231-1/+279
| | | | | | | | | | | | | | | | | | | | | | Description: 1、Add Histogram support to developer option 2、Add HDR & Non-HDR support to developer option 3、Add Saturation Level support to developer option 4、Add Anti Banding support to developer option Change-Id: I2db7e1be65a6b3ee04ebc46cb214dc1cc9667fc6 CRs-Fixed: 1103649
* | Merge "SnapdragonCamera: add features for 3rd-party apps" into ↵Linux Build Service Account2017-01-051-31/+297
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: add features for 3rd-party appsjunjiez2016-12-271-31/+297
| | | | | | | | | | | | | | | | | | | | | Add capture and recording features for 3rd-party app. Change-Id: Iefedbed2cb17cca17941e70f861448a2b8f97da2 CRs-Fixed: 1095457
* | | Merge "SnapdragonCamera:Improve camera app's robustness" into ↵Linux Build Service Account2017-01-051-0/+7
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Improve camera app's robustnessjianhuac2016-12-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We just load RenderScript engine once when initialize CaptureModule and destory it when destory CaptureModule, instead of load-destory engine by muti-thread when open-close camera device. Change-Id: I76f9e5f99061fb1557624ab683c37837ae1414f7
* | | | Merge "SnapdragonCamera:Add instant AEC to developer option" into ↵Linux Build Service Account2017-01-051-0/+13
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Add instant AEC to developer optionjunjiez2016-12-231-0/+13
| |/ | | | | | | | | | | | | Add instant AEC support to developer option Change-Id: Ia83a724966c453cfeb84e12c1728eab264bed6f8 CRs-Fixed: 1087493
* | Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into ↵Camera Software Integration2016-12-221-2/+2
|\ \ | |/ |/| | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2yingrenw2016-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Description: Solve the HFR Crash on 720 120FPS with Camera 2 when recording. Nullpointer crash. CaptureRequest native data copy don't have the tag data. Confirm the tag data can be copied. Change-Id: I745a09b789864db9cdbbe5cfcc8bcbc941e01bf3 CRs-Fixed: 1099749
* | Merge "SnapdragonCamera: Fix FC caused by session null" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix FC caused by session nullqimengp2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | Fix FC caused by session null Change-Id: I8f3b98cc47a10f25715bbb4c81accd87b2de432c
* | | SnapdragonCamera: Fix shutter button greyqimengp2016-12-131-2/+13
|/ / | | | | | | | | | | | | Shuter button will be grey in some situation. we need to reset Button state and state machine. Change-Id: I0c8170ff8338297659405d97ba9a7e2ae64b8f5f
* | SnapdragonCamera: Fix FC caused by mSession Nullqimengp2016-12-131-41/+90
| | | | | | | | | | | | | | | | | | | | | | | | There are lots of FC caused by mCameraDevice/mBuilder/mSession Null, In the condition: 1. Between opening camera app and not ready to preview. 2. App pause, and then resume to app 3. Restart session by makeup or flash mode change 4. restart all by change camera devices Checking NULL and add illegal state handler is a work around way. Change-Id: I26edfbde8944280c51f4a05f91deacb76e24b6f3
* | SnapdragonCamera: EIS is not enabled when enabling on the UIweijiew2016-12-131-1/+1
| | | | | | | | | | | | | | Stabilization on is not setted in request CRs-Fixed: 1099751 Change-Id: I6c905d26f459f0b232019830bca446e2d9f624d4
* | SnapdragonCamera: Fix don`t save the value about focus distancemingwax2016-12-131-7/+15
| | | | | | | | | | | | | | | | Don`t save the focus distance value when the user change the value. Add code for saving the value in xml when the user change the value. CRs-Fixed: 1095942 Change-Id: Ic2b88d67d068c17afcc12546028e99454070b8ab
* | SnapdragonCamera: Fix Don`t set setMaxFileSize when videoingmingwax2016-12-131-24/+171
| | | | | | | | | | | | | | Set the setMaxFileSize value when start recording video. CRs-Fixed: 1098808 Change-Id: I4fccb8b20040f3d56ce01626d5eedf671cc77b8f
* | SnapdragonCamera: Camera2 force close when turn on/off beautyweijiew2016-12-131-7/+6
| | | | | | | | | | | | | | Session was closed, but new session didn't create Change-Id: I09a03eef6386d4ebd7a988454503024af7ce1961 CRs-Fixed: 1066519
* | SnapdragonCamera:Avoid switching camera in countdownjunjiez2016-12-131-1/+1
|/ | | | | | | | | When countdown is over, there is a litter time before capture, and switch camera as this time will cause exception, so show the UI after both countdown and capture are over. Change-Id: I69f90d024f1fc70281db3ba38d9e078581e57d14 CRs-Fixed: 1094222
* Merge "SnapdragonCamera: Keep screen on when recording the video" into ↵Camera Software Integration2016-12-111-1/+29
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Keep screen on when recording the videomingwax2016-11-301-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Add the actions to keep the screen on or off. (1) We always keep the screen on when click video button for recording video. (2) We keep the screen on for 2 mins when click video button for stop recording video. (3) We clear the flag(FLAG_KEEP_SCREEN_ON) when exit the camera. CRs-Fixed: 1095512 change-Id: I283c29882f0654315536afbafc5072491343a38f
* | Merge "SnapdragonCamera:Fix crash when zooming" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-2/+2
|\ \
| * | SnapdragonCamera:Fix crash when zoomingjunjiez2016-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The args of the message CANCEL_TOUCH_FOCUS is wrong, and the handler always get 0 as the cameraId, when mono-only is enabled, the cameraId is 2. Change-Id: Ib6a9a5831d0403bd9d9df6959ed35440ac42cc77 CRs-Fixed: 1092598
* | | Merge "SnapdragonCamera:closing sequence improvement" into ↵Camera Software Integration2016-12-111-2/+0
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:closing sequence improvementjunjiez2016-11-301-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | when this is any camera with errors, invoke closeCamera to close them in sequence, do not close the one with errors first. Change-Id: I5cb2c206c16535f4a823c3a5545539cdbed5b6c7 CRs-Fixed: 1095549
* | | Merge "SnapdragonCamera:Camera reinit with wrong id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-1/+1
|\ \ \
| * | | SnapdragonCamera:Camera reinit with wrong idjunjiez2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we swith sceneMode, Camera will call getMainCameraId() to get the camera id to reinit,but the camera id is wrong because valus in SettingsManager is null, so use init() instead, it will get camera id from preference. Change-Id: I1d7dc95ca5231ab1f98ae64ac5ffd0f6aae9bf7c CRs-Fixed: 1088851
* | | | Merge "SnapdragonCamera: make copy of location before altering timestamp" ↵Camera Software Integration2016-12-091-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: make copy of location before altering timestampJay Wang2016-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a copy of saved location object before altering timestamp since we may end up re-using the same location object down the line. CRs-Fixed: 1007285 Change-Id: Ifa8b7cd3ecfe2dede5cfa155818f48f51f4405f1
* | | | Merge "SnapdragonCamera: Camera2 force close after focused" into ↵Camera Software Integration2016-12-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Camera2 force close after focusedweijiew2016-11-241-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handler message leaks the camera id, the camera id is set to 0 when handleing Message.As we known, rear camera id is 0 and front camera id is 1. Focus action runs normall when switching to rear camera, but focus action will lead to force close when switching to fornt camera. Change-Id: I7795b7cd0c34c256d1ad0066d13a51ed54cec67d CRs-Fixed: 1094009
* | | | Merge "SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeaked" into ↵Camera Software Integration2016-12-011-0/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeakedmingwax2016-11-221-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The dialog occur WindowLeaked when attached the activity is destroyed. Add judgement whether the activity is finishing before show dialog, if true return, false show dialog. CRs-Fixed: 1082314 Change-Id: I28fab4c0253d2524a05e7e18a78d7651bdc9ce4a
* | | Merge "SnapdragonCamera: Fix Camera2 FC click video btn for many times" into ↵Camera Software Integration2016-11-281-6/+93
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Camera2 FC click video btn for many timesmingwax2016-11-181-6/+93
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Design fault, missing code which capture exception. Code is not robust. Solution: Add code for catching exception and add listener for MediaRecorder occur error. Optimize toast tips. CRs-Fixed: 1088238 change-Id: I48fd8f91d1fc24ddc458f28c1eadd277bc3b34d9