Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge | Dave Sparks | 2009-05-21 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: camera/libcameraservice/CameraService.cpp | ||||
| * | AI 149133: Enable the camera permission check. | Dave Sparks | 2009-05-21 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | | Some debugging code was added to camera service. Later it was #ifdef'd out, but this change also removed the camera permission check. This change puts the permission check back in. BUG=1869264 Automated import of CL 149133 | ||||
| * | Automated import from //branches/cupcake/...@142889,142889 | Eric Laurent | 2009-03-26 | 1 | -1/+9 |
| | | |||||
| * | Automated import from //branches/cupcake/...@141708,141708 | Andreas Huber | 2009-03-24 | 1 | -0/+3 |
| | | |||||
| * | Automated import from //branches/cupcake/...@141613,141613 | Wu-cheng Li | 2009-03-24 | 1 | -4/+5 |
| | | |||||
| * | Automated import from //branches/cupcake/...@141597,141597 | Jason Sams | 2009-03-24 | 1 | -5/+12 |
| | | |||||
| * | auto import from //branches/cupcake_rel/...@141571 | The Android Open Source Project | 2009-03-19 | 3 | -1/+37 |
| | | |||||
* | | Fix permission hole in camera service. Some debugging code was added | Dave Sparks | 2009-05-20 | 2 | -6/+3 |
| | | | | | | | | | | | | to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code. | ||||
* | | Modify camera framework to use new streamlined binder interface. | Dave Sparks | 2009-05-11 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | This is the second half of bug 1837832. Modifies the camera client and camera service to use the new binder interface. Removes the old binder interface. There will be one more part to this change to surface the undefined callbacks to the Java layer so that partners can implement new features without having to touch the stack. | ||||
* | | Remove debug messages. | Wu-cheng Li | 2009-04-22 | 1 | -3/+3 |
| | | | | | | | | | | | | modified: core/java/android/hardware/Camera.java modified: camera/libcameraservice/CameraService.cpp | ||||
* | | Remove dangling media recorder client reference when setCamera() is used. | James Dong | 2009-04-20 | 1 | -1/+7 |
| | | |||||
* | | AI 143177: am: CL 142889 Fix issue #1736153 Camera shutter sound can be ↵ | Eric Laurent | 2009-03-27 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | muted by new AlarmClock setting. Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound. The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds. Original author: elaurent Merged from: //branches/cupcake/... Automated import of CL 143177 | ||||
* | | Automated import from //branches/donutburger/...@141992,141992 | Andy McFadden | 2009-03-24 | 1 | -0/+1 |
| | | |||||
* | | Automated import from //branches/donutburger/...@141782,141782 | Niko Catania | 2009-03-24 | 3 | -6/+47 |
| | | |||||
* | | Automated import from //branches/donutburger/...@141711,141711 | Andreas Huber | 2009-03-24 | 1 | -0/+3 |
| | | |||||
* | | Automated import from //branches/donutburger/...@141614,141614 | Wu-cheng Li | 2009-03-24 | 1 | -4/+5 |
| | | |||||
* | | Automated import from //branches/donutburger/...@141598,141598 | Jason Sams | 2009-03-24 | 1 | -5/+12 |
| | | |||||
* | | Automated import from //branches/donutburger/...@141469,141469 | Jason Sams | 2009-03-24 | 3 | -1/+37 |
|/ | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 8 | -0/+3851 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 8 | -3837/+0 |
| | |||||
* | auto import from //depot/cupcake/@132589 | The Android Open Source Project | 2009-03-03 | 4 | -56/+36 |
| | |||||
* | auto import from //depot/cupcake/@137055 | The Android Open Source Project | 2009-03-02 | 4 | -36/+56 |
| | |||||
* | auto import from //branches/cupcake/...@130745 | The Android Open Source Project | 2009-02-10 | 4 | -78/+313 |
| | |||||
* | auto import from //branches/cupcake/...@127101 | The Android Open Source Project | 2009-01-20 | 1 | -14/+42 |
| | |||||
* | auto import from //branches/cupcake/...@125939 | The Android Open Source Project | 2009-01-09 | 4 | -10/+76 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 3 | -56/+116 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 8 | -0/+3448 |