summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-075-3/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Cleanup openRecord error handlingGlenn Kasten2013-09-245-3/+29
* | | | | | | | | | | | | | | | | | | | | | | am ea0fadeb: audioflinger: offload: fix pause/flush/resumeEric Laurent2013-10-041-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | audioflinger: offload: fix pause/flush/resumeEric Laurent2013-10-041-2/+9
* | | | | | | | | | | | | | | | | | | | | | | am 026c5b07: Merge "audioflinger: fix wake lock acquisition check" into klp-devEric Laurent2013-10-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge "audioflinger: fix wake lock acquisition check" into klp-devEric Laurent2013-10-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | audioflinger: fix wake lock acquisition checkEric Laurent2013-10-041-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
* | | | | | | | | | | | | | | | | | | | | | | | | am 385e7509: fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port recon...Lajos Molnar2013-10-041-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" i...Lajos Molnar2013-10-041-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | MediaCodec: avoid codec EOS if flushing during port reconfigurationLajos Molnar2013-10-021-4/+3
* | | | | | | | | | | | | | | | | | | | | | | | am 19fffcbd: Merge "Camera3: track request status in inflight queue" into klp...Zhijun He2013-10-032-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Camera3: track request status in inflight queue" into klp-devZhijun He2013-10-032-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Camera3: track request status in inflight queueZhijun He2013-10-032-1/+18
* | | | | | | | | | | | | | | | | | | | | | | | | am 8097068d: Merge "Better recording wake lock accounting" into klp-devMarco Nelissen2013-10-032-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Better recording wake lock accounting" into klp-devMarco Nelissen2013-10-032-13/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Better recording wake lock accountingMarco Nelissen2013-10-032-13/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | am 580ed263: Merge "stagefright: enable adaptive playback based on codec form...Lajos Molnar2013-10-032-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "stagefright: enable adaptive playback based on codec format key" into ...Lajos Molnar2013-10-032-5/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | stagefright: enable adaptive playback based on codec format keyLajos Molnar2013-10-032-5/+49
* | | | | | | | | | | | | | | | | | | | | | | | | | | am b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle and shutter call...Eino-Ville Talvala2013-10-0335-334/+1030
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into k...Eino-Ville Talvala2013-10-0335-334/+1030
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-0235-334/+1030
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-037-0/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-037-0/+98
* | | | | | | | | | | | | | | | | | | | | | | | | | am a306ee6b: Remove now unused wfd commandline tool. (also unbreaks the build)Andreas Huber2013-10-032-384/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove now unused wfd commandline tool. (also unbreaks the build)Andreas Huber2013-10-032-384/+0
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 6ea551fa: Remove obsolete miracast sink code and friends.Andreas Huber2013-10-0320-5839/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete miracast sink code and friends.Andreas Huber2013-10-0220-5839/+1
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | am f05e50eb: Camera: only return static metadata for HAL3 deviceZhijun He2013-10-021-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Camera: only return static metadata for HAL3 deviceZhijun He2013-10-011-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | am 26c1fb23: Merge "Camera: drop stale callback buffer" into klp-devZhijun He2013-10-021-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Camera: drop stale callback buffer" into klp-devZhijun He2013-10-011-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Camera: drop stale callback bufferZhijun He2013-09-301-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | am 353fb9bf: Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-022-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "MediaTimeProvider support fixes" into klp-devLajos Molnar2013-10-012-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | MediaTimeProvider support fixesLajos Molnar2013-09-302-3/+18
| | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for non-na...Lajos Molnar2013-10-021-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "MediaCodecInfo: report supported color formats for non-native-window m...Lajos Molnar2013-10-011-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | MediaCodecInfo: report supported color formats for non-native-window modeLajos Molnar2013-09-301-6/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am 8b905e19: Merge "Camera: Set default thumbnail size with matched aspect ra...Zhijun He2013-10-012-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera: Set default thumbnail size with matched aspect ratio" into klp...Zhijun He2013-10-012-3/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Camera: Set default thumbnail size with matched aspect ratioZhijun He2013-09-302-3/+41
* | | | | | | | | | | | | | | | | | | | | | | | | am 1adf20ce: Merge "fix volume and effect enable delay on offloaded tracks" i...Eric Laurent2013-10-018-6/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "fix volume and effect enable delay on offloaded tracks" into klp-devEric Laurent2013-09-308-6/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | fix volume and effect enable delay on offloaded tracksEric Laurent2013-09-308-6/+63