summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/AndroidCameraManagerImpl.java
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Fix null pointer exception during monkey testlikaid2015-02-091-1/+1
| | | | | | CRs-Fixed: 788421 788422 788437 788445 Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
* SnapdragonCamera: Fix compatibility issues with KK.Sai Kumar Sanagavarapu2014-11-261-8/+1
| | | | | | | | | 1. Remove openLegacy call to open camera. 2. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 3. Fix NPE during startpreview if mParameters is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
* Camera: openLegacy to open HAL1 cameraRanjith Kagathi Ananda2014-10-081-1/+8
| | | | | | | | When HAL 3 module is enabled by default, use .openLegacy with api version CAMERA_HAL_API_VERSION_1_0 to get the HAL1 device instead of the regual .open call. Change-Id: Iec16c0b4e30f431bff4f4ad8bb83533f328c12b4
* Camera2: Fix callback with old data after camera switchIvan Evlogiev2014-06-201-6/+30
| | | | | | | - Fix race condition for calling camera callbacks with old data after camera switch Change-Id: If63e7903f3e7821220397b1b8cea4d9478ba3c94
* Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-1/+11
| | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* Camera: Add checker for null pointer exception during camera releaseSanthosh Kumar Thimmanna Bhattar2014-01-131-0/+3
| | | | | | | | | | In current code, handler will still try to execute command even camera is closed, so add null point checker to skip these commands ( cherrypicked from commit 63ae64c56b00f44956502822a0ddb96307ae7270 ) Change-Id: I71c30a5293364e084de650e92d9d0926e7e3d7c1 CRs-Fixed: 598600
* Camera2: Fix concurrency issues with camera messagesSanthosh Kumar Thimmanna Bhattar2014-01-131-4/+10
| | | | | | | | | | | Without this, multiple threads are trying to access same data and resulting in crash. ( cherrypicked from commit d11040c561e9add30768947aa93235ff08de03b1 ) Change-Id: Ib09950d6640afcd7962cba9ea5385d778f022abe CRs-Fixed: 542706
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Fix crash when trying to reopen the camera.ztenghui2013-10-281-2/+8
| | | | | | | | | | | | | | | | | | In this case, another app is using the Camera, such that the camera.open will hit an exception. We should show an dialog here. bug:11258139 Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
| * Fix memory leak due to inner class for handler.ztenghui2013-10-281-1/+4
| | | | | | | | | | | | | | | | To keep the existing interface, we just overwrite the handler here. bug:11336965 Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
| * Don't crash when preview surface could not be set.Sascha Haeberling2013-10-171-1/+1
| | | | | | | | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
* | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The longshot/burst pipeline mode uses an optimized path for triggering 'takePicture()' on each shutter callback. This should improve the shot-2-shot time. In addition to this there is also support for jpeg callbacks that only contain a jpeg file path. The callback in this case will only move the file stored by the lower layers in the correct directory. - The longshot burst pipeline can be enabled via this property: "persist.camera.longshot.enable"<-"0/1" - This change will allow longshot mode to be triggered in non-zsl mode as well. (Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b) (Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8) Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* | Don't crash when preview surface could not be set.Sascha Haeberling2013-10-211-1/+1
|/ | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-12/+5
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Merge "Don't crash the app if camera is not available." into ↵Sascha Haeberling2013-09-171-0/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * Don't crash the app if camera is not available.Sascha Haeberling2013-09-171-1/+4
| | | | | | | | | | | | Bug: 10747001 Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
* | Show dialog when camera device is not connected.Angus Kong2013-09-171-5/+81
|/ | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* Clean up Gallery codes.Angus Kong2013-08-091-2/+2
| | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-3/+3
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Add wrapper for face detection listener.Angus Kong2013-07-311-36/+78
| | | | | | bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
* Fix switching camera failure.Angus Kong2013-07-311-1/+1
| | | | | | bug:10110830 Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
* Refactor CameraManager.Angus Kong2013-07-291-0/+737
1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465