summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
* In the simulator, make sure that the preview thread is a Java thread,Marco Nelissen2009-08-132-3/+18
| | | | since we won't be going through the binder in single process mode.
* Fix issue 1795088 Improve audio routing codeEric Laurent2009-07-231-8/+1
| | | | | | | Initial commit for review. Integrated comments after patch set 1 review. Fixed lockup in AudioFlinger::ThreadBase::exit() Fixed lockup when playing tone with AudioPlocyService startTone()
* Hardware overlay supportBenny Wong2009-07-162-6/+47
| | | | Enable hardware overlay support for camera and video playback use cases
* resolved conflicts for merge of 04c7d0f8 to masterDave Sparks2009-07-082-8/+7
|\
| * Add timestamps to video frames to improve A/V sync.Dave Sparks2009-07-082-8/+7
| | | | | | | | Bug 1927069.
* | am b8a10fe4: Allow setPreviewDisplay after startPreview.Wu-cheng Li2009-07-012-50/+91
|\ \ | |/ | | | | | | | | | | Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e' * commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e': Allow setPreviewDisplay after startPreview.
| * Allow setPreviewDisplay after startPreview.Wu-cheng Li2009-07-012-50/+91
| |
* | am c6a482e7: Merge change 5199 into donutAndroid (Google) Code Review2009-06-242-11/+11
|\ \ | |/ | | | | | | | | | | Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112' * commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112': Only remove client after the hardware is teared down, so a new client
| * Only remove client after the hardware is teared down, so a new clientChih-Chung Chang2009-06-252-11/+11
| | | | | | | | | | | | is rejected before old client is done. Also check mUsers in all cases to make sure there are no existing client.
* | am 82a32714: Merge change 5190 into donutAndroid (Google) Code Review2009-06-242-12/+44
|\ \ | |/ | | | | | | | | | | Merge commit '82a32714f07d25259b91163d383ccdb74a166d2d' * commit '82a32714f07d25259b91163d383ccdb74a166d2d': Fix 1933269: startPreview failed.
| * Fix 1933269: startPreview failed.Chih-Chung Chang2009-06-242-12/+44
| | | | | | | | | | | | | | | | | | The reason we need this count is a new CameraService::connect() request may come in while the previous Client's destructor has not been run or is still running. If the last strong reference of the previous Client is gone but destructor has not been run, we should not allow the new Client to be created because we need to wait for the previous Client to tear down the hardware first.
* | am 8570e5fc: Merge change 4907 into donutAndroid (Google) Code Review2009-06-221-48/+91
|\ \ | |/ | | | | | | | | | | Merge commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598' * commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598': Add more debug messages for CameraService.
| * Add more debug messages for CameraService.Chih-Chung Chang2009-06-221-48/+91
| |
* | am 7f148d65: Merge change 4316 into donutAndroid (Google) Code Review2009-06-161-6/+6
|\ \ | |/ | | | | | | | | | | | | Merge commit '7f148d65051e577cc4a002183ec55d625b51de85' * commit '7f148d65051e577cc4a002183ec55d625b51de85': Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash." Enable more debug message to debug the Camera startPreview bug.
| * Enable more debug message to debug the Camera startPreview bug.Chih-Chung Chang2009-06-161-6/+6
| |
* | am 084af5e1: Merge change 3551 into donutAndroid (Google) Code Review2009-06-101-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4' * commit '084af5e1977e2278e68a69615f55d5fe3bb6c1a4': Allow the owner to reconnect to Camera.
| * Allow the owner to reconnect to Camera.Chih-Chung Chang2009-06-091-1/+1
| |
* | some work to try to reduce the code size of some native librariesMathias Agopian2009-05-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make sure that all binder Bn classes define a ctor and dtor in their respective library. This avoids duplication of the ctor/dtor in libraries where these objects are instantiated. This is also cleaner, should we want these ctor/dtor to do something one day. - same change as above for some Bp classes and various other non-binder classes - moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere. - improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere - IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16 - implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called. The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
* | am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into ↵Dave Sparks2009-05-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | manual_merge Merge commit '7283fb18022674daee4dcdc3a218190791f8cd0e' * commit '7283fb18022674daee4dcdc3a218190791f8cd0e': AI 149133: Enable the camera permission check.
| * Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_mergeDave Sparks2009-05-211-1/+1
| |\ | | | | | | | | | | | | Conflicts: camera/libcameraservice/CameraService.cpp
| | * AI 149133: Enable the camera permission check.Dave Sparks2009-05-212-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,142889Eric Laurent2009-03-261-1/+9
| | |
| | * Automated import from //branches/cupcake/...@141708,141708Andreas Huber2009-03-241-0/+3
| | |
| | * Automated import from //branches/cupcake/...@141613,141613Wu-cheng Li2009-03-241-4/+5
| | |
| | * Automated import from //branches/cupcake/...@141597,141597Jason Sams2009-03-241-5/+12
| | |
| | * auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-193-1/+37
| | |
* | | am db79edc5: Merge change 2168 into donutAndroid (Google) Code Review2009-05-212-6/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5' * commit 'db79edc5dc39e103356cad8781148a8794520bc5': Fix permission hole in camera service. Some debugging code was added
| * | Fix permission hole in camera service. Some debugging code was addedDave Sparks2009-05-202-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.
* | | move libbinder's header files under includes/binderMathias Agopian2009-05-202-6/+6
| | |
* | | checkpoint: split libutils into libutils + libbinderMathias Agopian2009-05-201-0/+1
|/ /
* | Modify camera framework to use new streamlined binder interface.Dave Sparks2009-05-111-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 Li2009-04-221-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 Dong2009-04-201-1/+7
| |
* | AI 143177: am: CL 142889 Fix issue #1736153 Camera shutter sound can be ↵Eric Laurent2009-03-271-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,141992Andy McFadden2009-03-241-0/+1
| |
* | Automated import from //branches/donutburger/...@141782,141782Niko Catania2009-03-243-6/+47
| |
* | Automated import from //branches/donutburger/...@141711,141711Andreas Huber2009-03-241-0/+3
| |
* | Automated import from //branches/donutburger/...@141614,141614Wu-cheng Li2009-03-241-4/+5
| |
* | Automated import from //branches/donutburger/...@141598,141598Jason Sams2009-03-241-5/+12
| |
* | Automated import from //branches/donutburger/...@141469,141469Jason Sams2009-03-243-1/+37
|/
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-038-0/+3851
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-038-3837/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-034-56/+36
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-024-36/+56
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-104-78/+313
|
* auto import from //branches/cupcake/...@127101The Android Open Source Project2009-01-201-14/+42
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-094-10/+76
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-173-56/+116
|
* Initial ContributionThe Android Open Source Project2008-10-218-0/+3448