summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Updates to remote control client (un)registrationJean-Michel Trivi2012-12-271-53/+69
* | | | | | | | am f2fc1cbb: Merge "Fix stack traversal order when removing or adding media b...Jean-Michel Trivi2013-01-021-19/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix stack traversal order when removing or adding media button receiver"Jean-Michel Trivi2013-01-021-19/+31
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix stack traversal order when removing or adding media button receiverJean-Michel Trivi2012-12-261-19/+31
* | | | | | | | am f3ec1542: am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect:...James Dong2012-12-281-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberE...James Dong2012-12-281-2/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| | | |\ \ \ \ \
| | | | * | | | | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
* | | | | | | | | am cf1df194: am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"James Dong2012-12-281-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"James Dong2012-12-281-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am c8db3b8a: Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Set "isdrm" info in MediastoreErik Almqvist2012-12-061-1/+2
| | * | | | | | | | am 62ec9588: Merge "Fix typo"Andrew Hsieh2012-12-202-8/+8
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix typoAndrew Hsieh2012-12-192-8/+8
| | | |/ / / / / /
| | * | | | | | | am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat ...Andreas Huber2012-12-061-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Make it clear that non-optional MediaFormat keys are requiredAndreas Huber2012-12-051-2/+2
* | | | | | | | | am 246f4529: Merge "Remove unused audio source"Jean-Michel Trivi2012-12-281-10/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Remove unused audio sourceJean-Michel Trivi2012-12-271-10/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | am c30f45b9: Add comments in AudioService focus and media button stack traversalJean-Michel Trivi2012-12-261-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add comments in AudioService focus and media button stack traversalJean-Michel Trivi2012-12-261-3/+11
* | | | | | | | am eca3eb59: Merge "Don\'t create weird ByteBuffers"Marco Nelissen2012-12-191-2/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Don't create weird ByteBuffers"Marco Nelissen2012-12-191-2/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Don't create weird ByteBuffersMarco Nelissen2012-12-191-2/+17
| | * | | | | | | Revert "Update AudioTrack comments"Glenn Kasten2012-12-181-6/+0
| | * | | | | | | Update AudioTrack commentsGlenn Kasten2012-12-181-0/+6
* | | | | | | | | Merge "Update framework to support r5967 of Skia." into master-chromiumDerek Sollenberger2012-12-191-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update framework to support r5967 of Skia.Derek Sollenberger2012-12-121-0/+1
* | | | | | | | | Merge "Simplify AudioTrack event handling and fix a race"Glenn Kasten2012-12-181-30/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify AudioTrack event handling and fix a raceGlenn Kasten2012-11-291-30/+17
* | | | | | | | | | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-188-29/+29
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Turn off execute bit for ordinary media files"Glenn Kasten2012-12-1721-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Turn off execute bit for ordinary media filesGlenn Kasten2012-11-1521-0/+0
* | | | | | | | | | Fix typoAndrew Hsieh2012-12-122-8/+8
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "AudioTrack error checks"Glenn Kasten2012-12-061-25/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioTrack error checksGlenn Kasten2012-12-051-25/+39
* | | | | | | | | | Merge "Allow more APIs before write in static buffer mode"Glenn Kasten2012-12-061-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow more APIs before write in static buffer modeGlenn Kasten2012-11-291-6/+6
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Use the utility logging methods and single tag"Glenn Kasten2012-12-061-8/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use the utility logging methods and single tagGlenn Kasten2012-11-291-8/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge "Document that ByteBuffer position not updated"Glenn Kasten2012-12-061-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document that ByteBuffer position not updatedGlenn Kasten2012-11-081-0/+2
* | | | | | | | | | | Merge "Remove dead method native_get_session_id()"Glenn Kasten2012-12-061-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove dead method native_get_session_id()Glenn Kasten2012-11-291-2/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "more fixes on safe volume warning message"Eric Laurent2012-12-061-35/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | more fixes on safe volume warning messageEric Laurent2012-12-051-35/+79
* | | | | | | | | | | | Merge "Remove whitespace at end of line"Glenn Kasten2012-12-061-84/+83
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove whitespace at end of lineGlenn Kasten2012-11-291-84/+83
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Import only what's needed"Glenn Kasten2012-12-063-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |