summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...Andreas Huber2010-10-132-0/+8
|\
| * Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-132-0/+8
| |\
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-122-0/+8
* | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...Andreas Huber2010-10-131-0/+1
|\ \ \ | |/ /
| * | Merge "HTTP Live content that are tagged as complete are now seekable." into ...Andreas Huber2010-10-131-0/+1
| |\ \
| | * | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-121-0/+1
| | |/
* | | am ba799098: Merge changes I76513387,I335fb671 into gingerbreadJoe Onorato2010-10-121-1/+4
|\ \ \ | |/ /
| * | turn off the electron beamMathias Agopian2010-10-121-1/+4
* | | am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-112-3/+3
|\ \ \ | |/ /
| * | Merge "OBB: rearrange to be entirely asynchronous" into gingerbreadKenny Root2010-10-112-3/+3
| |\ \
| | * | OBB: rearrange to be entirely asynchronousKenny Root2010-10-112-3/+3
| | |/
* | | am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." ...Jeff Brown2010-10-112-3/+6
|\ \ \ | |/ /
| * | Fix an event injection bug when the policy is bypassed.Jeff Brown2010-10-112-3/+6
| |/
* | am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." in...Jeff Brown2010-10-103-70/+74
|\ \ | |/
| * Added more robust tracking and cancelation of events.Jeff Brown2010-10-103-70/+74
* | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...Andreas Huber2010-10-082-3/+5
|\ \ | |/
| * Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...Andreas Huber2010-10-082-3/+5
| |\
| | * Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...Andreas Huber2010-10-082-3/+5
* | | am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-081-0/+1
|\ \ \ | |/ /
| * | Added getter for session Id to AudioSinkEric Laurent2010-10-071-0/+1
| |/
* | am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." i...Jeff Brown2010-10-071-3/+59
|\ \ | |/
| * Merge "Switch Looper back to using poll() instead of epoll()." into gingerbreadJeff Brown2010-10-071-3/+59
| |\
| | * Switch Looper back to using poll() instead of epoll().Jeff Brown2010-10-071-3/+59
* | | resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-074-24/+55
|\ \ \
| * | | Update of DRM framework.Takeshi Aimi2010-10-044-24/+55
* | | | am 949f7d90: Merge "Work to support switching transport streams mid-stream an...Andreas Huber2010-10-072-2/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Work to support switching transport streams mid-stream and signalling discont...Andreas Huber2010-10-072-2/+4
* | | | am 02654f01: Merge "On this particular device the hardware video decoder spit...Andreas Huber2010-10-072-1/+5
|\ \ \ \ | |/ / /
| * | | On this particular device the hardware video decoder spits out buffers that d...Andreas Huber2010-10-072-1/+5
| | |/ | |/|
* | | am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrac...Andreas Huber2010-10-051-3/+3
|\ \ \ | |/ /
| * | Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after sub...Andreas Huber2010-10-051-3/+3
* | | am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbreadJeff Brown2010-10-051-2/+9
|\ \ \ | |/ /
| * | Make secure views tolerate IME overlays.Jeff Brown2010-10-051-2/+9
* | | am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANati...Mathias Agopian2010-10-043-5/+19
|\ \ \ | |/ /
| * | fix [2835280] Add support for cancelling buffers to ANativeWindowMathias Agopian2010-10-043-5/+19
* | | am 19058877: Merge "refactored screenshot code" into gingerbreadMathias Agopian2010-10-042-1/+32
|\ \ \ | |/ /
| * | Merge "refactored screenshot code" into gingerbreadMathias Agopian2010-10-042-1/+32
| |\ \
| | * | refactored screenshot codeMathias Agopian2010-10-042-1/+32
* | | | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...James Dong2010-10-041-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fixed an issue where the reserved free space in the file writer was la...James Dong2010-10-041-0/+1
| |\ \ \
| | * | | Fixed an issue where the reserved free space in the file writer was larger th...James Dong2010-10-041-0/+1
| | |/ /
* | | | am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbreadKenny Root2010-10-041-7/+17
|\ \ \ \ | |/ / /
| * | | Use pread() in ZipFileRO for LinuxKenny Root2010-10-041-7/+17
| |/ /
* | | am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbreadKenny Root2010-10-041-9/+2
|\ \ \ | |/ /
| * | Merge "ZipFileRO: moar logging and wrap close" into gingerbreadKenny Root2010-10-041-9/+2
| |\ \
| | * | ZipFileRO: moar logging and wrap closeKenny Root2010-10-011-9/+2
* | | | am e951ef07: Merge "Wait for initial device scan to finish before updating co...Jeff Brown2010-10-012-8/+14
|\ \ \ \ | |/ / /
| * | | Wait for initial device scan to finish before updating config.Jeff Brown2010-10-012-8/+14
* | | | am f6295b35: Merge "Minor logging changes to input dispatcher to help with de...Jeff Brown2010-10-011-2/+6
|\ \ \ \ | |/ / /
| * | | Minor logging changes to input dispatcher to help with debugging.Jeff Brown2010-10-011-2/+6
| |/ /