summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4823964d: am efc4d489: Merge "audioflinger: add HOTWORD audio source." int...Eric Laurent2013-09-116-2/+33
|\
| * am efc4d489: Merge "audioflinger: add HOTWORD audio source." into klp-devEric Laurent2013-09-116-2/+33
| |\
| | * Merge "audioflinger: add HOTWORD audio source." into klp-devEric Laurent2013-09-126-2/+33
| | |\
| | | * audioflinger: add HOTWORD audio source.Eric Laurent2013-09-106-2/+33
* | | | am 33010b80: am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
|\ \ \ \ | |/ / /
| * | | am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| |\ \ \ | | |/ /
| | * | Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
* | | | am fe2d2ac2: am c728c580: Merge "Make sure the encoder instance is safely rel...Andreas Huber2013-09-101-2/+22
|\ \ \ \ | |/ / /
| * | | am c728c580: Merge "Make sure the encoder instance is safely release()\'d bef...Andreas Huber2013-09-101-2/+22
| |\ \ \ | | |/ /
| | * | Merge "Make sure the encoder instance is safely release()'d before its" into ...Andreas Huber2013-09-101-2/+22
| | |\ \
| | | * | Make sure the encoder instance is safely release()'d before itsAndreas Huber2013-09-061-2/+22
* | | | | am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-102-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-102-0/+20
| |\ \ \ \ | | |/ / /
| | * | | MediaMuxer: Hook up setLocation methodZhijun He2013-09-092-0/+20
* | | | | am 556c93c7: am 3c939600: am d6ca2e8b: Merge "Uninitialized pointer can cause...Glenn Kasten2013-09-100-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 3c939600: am d6ca2e8b: Merge "Uninitialized pointer can cause crash."Glenn Kasten2013-09-100-0/+0
| |\ \ \ \
| | * \ \ \ am d6ca2e8b: Merge "Uninitialized pointer can cause crash."Glenn Kasten2013-09-100-0/+0
| | |\ \ \ \
| | | * \ \ \ Merge "Uninitialized pointer can cause crash."Glenn Kasten2013-09-100-0/+0
| | | |\ \ \ \
| | | | * | | | Uninitialized pointer can cause crash.You Kim2012-11-211-1/+1
* | | | | | | | Merge "HDCP: use getCaps() to query HDCP caps"Chong Zhang2013-09-101-5/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | HDCP: use getCaps() to query HDCP capsChong Zhang2013-09-071-5/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am a57c8b5c: am 6220f993: Merge "camera3: Dump latest request sent with dumps...Igor Murashkin2013-09-092-1/+78
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 6220f993: Merge "camera3: Dump latest request sent with dumpsys" into klp-devIgor Murashkin2013-09-092-1/+78
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "camera3: Dump latest request sent with dumpsys" into klp-devIgor Murashkin2013-09-092-1/+78
| | |\ \ \ \ \ \
| | | * | | | | | camera3: Dump latest request sent with dumpsysIgor Murashkin2013-09-062-1/+78
* | | | | | | | | am 8a910716: am 6ca83fad: Merge "audioflinger: no effects on offloaded tracks...Eric Laurent2013-09-095-13/+83
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6ca83fad: Merge "audioflinger: no effects on offloaded tracks" into klp-devEric Laurent2013-09-095-13/+83
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "audioflinger: no effects on offloaded tracks" into klp-devEric Laurent2013-09-095-13/+83
| | |\ \ \ \ \ \ \
| | | * | | | | | | audioflinger: no effects on offloaded tracksEric Laurent2013-09-095-13/+83
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | am 8d7e1693: am d1d6467d: Camera: Correct stream id typesZhijun He2013-09-099-35/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am d1d6467d: Camera: Correct stream id typesZhijun He2013-09-099-35/+33
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Camera: Correct stream id typesZhijun He2013-09-089-35/+33
| | |/ / / / / /
* | | | | | | | am 7f69ab55: am 84b7fb0c: Camera: Send VIDEO_SNAPSHOT intent for video snapsh...Zhijun He2013-09-061-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 84b7fb0c: Camera: Send VIDEO_SNAPSHOT intent for video snapshot caseZhijun He2013-09-061-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Camera: Send VIDEO_SNAPSHOT intent for video snapshot caseZhijun He2013-09-061-0/+6
| | |/ / / / /
* | | | | | | am 99b84e8b: am 3b4529e0: audioflinger: remove async write race conditionsEric Laurent2013-09-062-53/+100
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3b4529e0: audioflinger: remove async write race conditionsEric Laurent2013-09-062-53/+100
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | audioflinger: remove async write race conditionsEric Laurent2013-09-062-53/+100
* | | | | | | am a28539b0: am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
* | | | | | | am c2cfaf78: am a82975e0: Merge "Effects Factory changes for effects offload"...Eric Laurent2013-09-064-2/+298
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a82975e0: Merge "Effects Factory changes for effects offload" into klp-devEric Laurent2013-09-064-2/+298
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Effects Factory changes for effects offload" into klp-devEric Laurent2013-09-064-2/+298
| | |\ \ \ \ \
| | | * | | | | Effects Factory changes for effects offloadjpadmana2013-09-064-2/+298
* | | | | | | | am e0fdfdd5: am c23981d9: Merge "Better workaround for slow decoders." into k...Marco Nelissen2013-09-061-4/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c23981d9: Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Better workaround for slow decoders.Marco Nelissen2013-09-041-4/+19
* | | | | | | | am 6e32da82: am 36a8b33a: Merge "camera: Fix race condition between setParame...Ruben Brunk2013-09-051-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /