summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 00bbca96: Merge "Don\'t even try to verify the native resolution validity ...Andreas Huber2013-05-021-2/+11
|\
| * Merge "Don't even try to verify the native resolution validity a" into jb-mr2...Andreas Huber2013-05-021-2/+11
| |\
| | * Don't even try to verify the native resolution validity aAndreas Huber2013-05-011-2/+11
* | | am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output for...Andreas Huber2013-05-021-0/+7
|\ \ \ | |/ /
| * | Merge "Fix miracast source code to ignore the encoder output format change" i...Andreas Huber2013-05-021-0/+7
| |\ \
| | * | Fix miracast source code to ignore the encoder output format changeAndreas Huber2013-05-011-0/+7
* | | | am bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
|\ \ \ \ | |/ / /
| * | | Merge "Fix reverb at 48kHz" into jb-mr2-devEric Laurent2013-05-011-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix reverb at 48kHzEric Laurent2013-05-011-6/+6
| | |/
* | | am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb...Andreas Huber2013-05-013-85/+265
|\ \ \ | |/ /
| * | Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-devAndreas Huber2013-05-013-85/+265
| |\ \
| | * | Support MediaCodec::getOutputFormat for encodersAndreas Huber2013-04-303-85/+265
| | |/
* | | am 3c7c39af: Merge "Camera3: Add missing buffer listener include (for ZSL)" i...Igor Murashkin2013-05-011-0/+48
|\ \ \ | |/ /
| * | Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-devIgor Murashkin2013-05-011-0/+48
| |\ \
| | * | Camera3: Add missing buffer listener include (for ZSL)Igor Murashkin2013-05-011-0/+48
* | | | am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
|\ \ \ \ | |/ / /
| * | | Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
| |\ \ \ | | |/ /
| | * | Camera3: Add ZSL stream supportIgor Murashkin2013-04-2919-66/+1751
| | * | camera: Add new RingBufferConsumer to keep a ring buffer of acquired framesIgor Murashkin2013-04-293-1/+537
| | * | Camera3: Add input stream supportIgor Murashkin2013-04-267-28/+473
* | | | am d8c7ad1c: Camera: Don\'t complain repeatedly about missing android.led.ava...Igor Murashkin2013-04-302-4/+6
|\ \ \ \ | |/ / /
| * | | Camera: Don't complain repeatedly about missing android.led.availableLedsIgor Murashkin2013-04-302-4/+6
| | |/ | |/|
* | | am b7e2ef14: Merge "ProCamera: Add security permission checks for disabling t...Igor Murashkin2013-04-263-0/+82
|\ \ \ | |/ /
| * | Merge "ProCamera: Add security permission checks for disabling transmit LED" ...Igor Murashkin2013-04-273-0/+82
| |\ \
| | * | ProCamera: Add security permission checks for disabling transmit LEDIgor Murashkin2013-04-253-0/+82
* | | | am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting k...Eino-Ville Talvala2013-04-2611-149/+263
|\ \ \ \ | |/ / /
| * | | Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into ...Eino-Ville Talvala2013-04-2711-149/+263
| |\ \ \ | | | |/ | | |/|
| | * | Camera2: Fix deadlock on shutdown due to client getting killed.Eino-Ville Talvala2013-04-2611-149/+263
* | | | am dd309b97: Merge "Handle the case where an asynchronous prepare was initiat...Andreas Huber2013-04-252-0/+23
|\ \ \ \ | |/ / /
| * | | Merge "Handle the case where an asynchronous prepare was initiated and then" ...Andreas Huber2013-04-252-0/+23
| |\ \ \
| | * | | Handle the case where an asynchronous prepare was initiated and thenAndreas Huber2013-04-252-0/+23
* | | | | am 8d2d4932: audioflinger: fix duplicating track sampling rateEric Laurent2013-04-251-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | audioflinger: fix duplicating track sampling rateEric Laurent2013-04-251-0/+3
| |/ / /
* | | | am 0dbff625: Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
|\ \ \ \
| * \ \ \ Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| |\ \ \ \
| | * | | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
* | | | | | am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix a race condition of MediaPlayerServce::Client::mClientbeanz2012-11-051-1/+1
* | | | | | am 7f86d983: Merge "Remove all traces of wifi display sink implementation and...Andreas Huber2013-04-2426-6049/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Remove all traces of wifi display sink implementation and supporting c...Andreas Huber2013-04-2426-6049/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove all traces of wifi display sink implementation and supporting code.Andreas Huber2013-04-2326-6049/+4
* | | | | | am 5e437722: Merge "Camera3: Register all stream buffers at stream configurat...Eino-Ville Talvala2013-04-231-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Camera3: Register all stream buffers at stream configuration time." in...Eino-Ville Talvala2013-04-231-0/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Camera3: Register all stream buffers at stream configuration time.Eino-Ville Talvala2013-04-191-0/+22
* | | | | | am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
| |\ \ \ \ \
| | * | | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| |/ / / / /
* | | | | | am 4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where ...Andreas Huber2013-04-222-26/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "3rd time's the charm, right? Fix another instance where MediaCodec wou...Andreas Huber2013-04-222-26/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | | |