summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeSt...Eric Laurent2014-05-231-133/+147
|\
| * am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"Eric Laurent2014-05-231-133/+147
| |\
| | * AudioService: fix cross deadlock in VolumeStreamStateEric Laurent2014-05-231-133/+147
| * | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-296-36/+83
| |\ \ | | |/ | |/|
| | * am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| | |\
| | * \ am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | |\ \
| | * \ \ am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
| | |\ \ \
| | * \ \ \ am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
| | |\ \ \ \
| | * \ \ \ \ am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i...Eric Laurent2014-03-061-1/+1
| | |\ \ \ \ \
* | | \ \ \ \ \ 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 eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"Marco Nelissen2014-04-251-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Release DrmManagerClient resourcesMattias Nilsson2014-04-151-0/+13
* | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-6/+147
* | | | | | | | | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-191-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Verify certificatesMarco Nelissen2014-03-132-0/+46
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from Audio...Zhihai Xu2014-03-121-1/+1
| |/ / / / /
* | | | | | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ExifInterface: fix class load failureZhijun He2014-03-061-1/+1
| | |_|_|/ | |/| | |
* | | | | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i...Eric Laurent2014-03-061-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fix RemoteController synchronization modeJean-Michel Trivi2014-03-061-1/+1
* | | | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas...Narayan Kamath2014-01-1614-23/+23
|\ \ \ \ | | |/ / | |/| |
| * | | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1514-23/+23
* | | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-073-3/+3
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-3/+3
* | | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...Narayan Kamath2014-01-071-1/+1
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-071-1/+1
* | | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...Narayan Kamath2014-01-072-4/+4
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-4/+4
* | | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...Narayan Kamath2014-01-071-6/+6
|\ \ \ \ | |/ / /
| * | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-6/+6
* | | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-181-2/+0
|\ \ \ \ | |/ / /
| * | | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-2/+0
* | | | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
|\ \ \ \ | |/ / /
| * | | Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
| |\ \ \
| | * | | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-11/+11
* | | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-131-4/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Use java.util.Objects instead on internal APIKenny Root2013-12-131-4/+3
| |/ /
* | | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34
* | | Only scan for wifi display when there is no active connectionsChong Zhang2013-11-191-6/+0
|/ /