summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge "Add APIs for creating a system priority session and getting controllers"RoboErik2014-05-075-12/+61
|\ \ \ | |/ /
| * | Add APIs for creating a system priority session and getting controllersRoboErik2014-05-065-12/+61
| |/
* | Add AudioFormat.ENCODING_PCM_FLOATGlenn Kasten2014-05-061-1/+3
* | Add AudioFormat.getBytesPerSample and use itGlenn Kasten2014-05-064-4/+21
|/
* Merge "Add playback state and metadata to dump"RoboErik2014-05-022-0/+23
|\
| * Add playback state and metadata to dumpRoboErik2014-05-012-0/+23
* | Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"Lajos Molnar2014-05-021-12/+97
|\ \ | |/ |/|
| * MediaHTTPConnection: support header android-allow-cross-domain-redirectLajos Molnar2014-04-291-12/+97
* | Fix sdk buildRoboErik2014-05-011-2/+1
* | Merge "Bounds Check in onPlaySoundEffect"Natalie Silvanovich2014-05-011-0/+5
|\ \
| * | Bounds Check in onPlaySoundEffectNatalie Silvanovich2014-05-011-0/+5
* | | Merge "Add Session API calls to RCC and AudioManager"RoboErik2014-05-017-73/+598
|\ \ \
| * | | Add Session API calls to RCC and AudioManagerRoboErik2014-05-017-73/+598
* | | | Merge "Add dump to MediaSessionService"RoboErik2014-05-012-0/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Add dump to MediaSessionServiceRoboErik2014-04-292-0/+18
| |/ /
* | | Merge "Fix MediaFocusControl index management for PlayerRecord"Jean-Michel Trivi2014-04-301-7/+13
|\ \ \ | |_|/ |/| |
| * | Fix MediaFocusControl index management for PlayerRecordJean-Michel Trivi2014-04-301-7/+13
* | | Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"Glenn Kasten2014-04-291-0/+10
|\ \ \ | |/ / |/| |
| * | Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDEGlenn Kasten2014-04-151-0/+10
* | | resolved conflicts for merge of 3ce4f3d0 to masterElliott Hughes2014-04-281-4/+3
|\ \ \
| * \ \ am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."Elliott Hughes2014-04-281-4/+3
| |\ \ \
| | * | | Track libcore.os' move to android.system.Elliott Hughes2014-04-281-4/+3
* | | | | am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resour...Marco Nelissen2014-04-251-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
| |\ \ \ \ | | |/ / /
| | * | | Release DrmManagerClient resourcesMattias Nilsson2014-04-151-0/+13
* | | | | Merge "camera2: Add DNG creator class."Ruben Brunk2014-04-251-0/+254
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | camera2: Add DNG creator class.Ruben Brunk2014-04-241-0/+254
* | | | | Merge "Remove VideoEditor"Lajos Molnar2014-04-2222-12923/+0
|\ \ \ \ \
| * | | | | Remove VideoEditorLajos Molnar2014-04-2122-12923/+0
| |/ / / /
* | | | | PlayerRecord: remove obsolete accessorsJean-Michel Trivi2014-04-221-12/+0
* | | | | Merge "MediaFocusControl: priority to playing players for media button"Jean-Michel Trivi2014-04-222-95/+134
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MediaFocusControl: priority to playing players for media buttonJean-Michel Trivi2014-04-222-95/+134
* | | | | am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 3c8bbe24: Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
| |\ \ \ \
| | * | | | Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
* | | | | | Add RouteProviders to the new Media APIsRoboErik2014-04-1735-474/+2547
| |_|/ / / |/| | | |
* | | | | media: don't rely on Java 6 parseInt error on leading '+' signLajos Molnar2014-04-161-18/+19
| |_|_|/ |/| | |
* | | | Merge "Implement USB Audio across Nexus Devices Fix issues with connecting no...Paul McLean2014-04-111-14/+22
|\ \ \ \
| * | | | Implement USB Audio across Nexus DevicesPaul McLean2014-04-111-14/+22
* | | | | Merge "Revert "Revert "Initial implementation of USB Audio output."""Paul McLean2014-04-112-7/+25
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Initial implementation of USB Audio output.""Paul McLean2014-04-092-7/+25
* | | | | am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fa...Elliott Hughes2014-04-111-3/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o...Elliott Hughes2014-04-111-3/+5
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge "generateProjectThumbnail can fail to close output stream"Elliott Hughes2014-04-111-3/+5
| | |\ \
| | | * | generateProjectThumbnail can fail to close output streamHenrik Baard2013-07-111-3/+5
| * | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-29/+26
* | | | | MediaFocusControl: fix commentJean-Michel Trivi2014-04-101-4/+2
* | | | | Audio focus doesn't affect RemoteControllerJean-Michel Trivi2014-04-081-164/+101
| |_|_|/ |/| | |
* | | | Revert "Initial implementation of USB Audio output."Eric Laurent2014-04-072-25/+7
* | | | Merge "Simplify and document AudioTrack gain"Glenn Kasten2014-04-041-50/+67
|\ \ \ \