summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch...Narayan Kamath2014-01-076-27/+28
|\
| * am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-076-27/+28
| |\
| | * AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-076-27/+28
* | | am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch...Narayan Kamath2014-01-073-37/+37
|\ \ \ | |/ /
| * | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...Narayan Kamath2014-01-073-37/+37
| |\ \ | | |/
| | * AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-073-37/+37
* | | am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch...Narayan Kamath2014-01-074-57/+65
|\ \ \ | |/ /
| * | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...Narayan Kamath2014-01-074-57/+65
| |\ \ | | |/
| | * AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-074-57/+65
* | | am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch...Narayan Kamath2014-01-072-20/+20
|\ \ \ | |/ /
| * | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...Narayan Kamath2014-01-072-20/+20
| |\ \ | | |/
| | * AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-072-20/+20
* | | Merge "Fix RemoteController synchronization mode"Jean-Michel Trivi2014-01-061-1/+1
|\ \ \
| * | | Fix RemoteController synchronization modeJean-Michel Trivi2014-01-021-1/+1
* | | | MediaRecorder: add getSurface() api and SURFACE video sourceChong Zhang2014-01-062-3/+49
|/ / /
* | | ExifInterface: fix class load failureZhijun He2013-12-201-1/+1
* | | Merge "libexif is now libjhead"Marco Nelissen2013-12-191-2/+2
|\ \ \
| * | | libexif is now libjheadMarco Nelissen2013-12-191-2/+2
* | | | am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "Media...Narayan Kamath2013-12-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
| | |\ \
| | | * | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
* | | | | am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused fiel...Narayan Kamath2013-12-182-9/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-182-9/+0
| |\ \ \ | | |/ /
| | * | Remove unused field from MediaMuxerNarayan Kamath2013-12-182-9/+0
| | |/
* | | am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long ...Elliott Hughes2013-12-164-29/+29
|\ \ \ | |/ /
| * | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
| |\ \ | | |/
| | * Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-164-29/+29
| | |\
| | | * AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-104-29/+29
* | | | resolved conflicts for merge of e0b14ea7 to masterKenny Root2013-12-132-8/+7
|\ \ \ \ | |/ / /
| * | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-132-8/+7
| |\ \ \ | | |/ /
| | * | Use java.util.Objects instead on internal APIKenny Root2013-12-132-8/+7
| | |/
* | | Add caption window color attributeAlan Viverette2013-12-111-0/+4
* | | Update comments for AudioRecord IllegalArgumentExceptionGlenn Kasten2013-12-021-3/+4
* | | Document need to call AudioRecord.getState() after constructionGlenn Kasten2013-12-021-0/+3
* | | Fix typo nbChannels -> channelMaskGlenn Kasten2013-11-222-2/+2
* | | am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no lo...Jeff Brown2013-11-211-27/+34
|\ \ \ | |/ /
| * | am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34
| |\ \
| | * | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34
* | | | am db44cb92: am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when...Chong Zhang2013-11-201-6/+0
|\ \ \ \ | |/ / /
| * | | am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no ...Chong Zhang2013-11-201-6/+0
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Only scan for wifi display when there is no active connectionsChong Zhang2013-11-191-6/+0
* | | Remove unused imports from frameworks/base.John Spurlock2013-11-20111-419/+0
* | | am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from init...Jeff Brown2013-11-152-8/+82
|\ \ \ | |/ /
| * | am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast s...Jeff Brown2013-11-152-8/+82
| |\ \ | | |/
| | * Disallow applications from initiating cast screen.Jeff Brown2013-11-152-8/+82
* | | am 7c9adaf6: am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in ...Jean-Michel Trivi2013-11-141-3/+2
|\ \ \ | |/ /
| * | am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControl...Jean-Michel Trivi2013-11-141-3/+2
| |\ \ | | |/
| | * Fix RemoteController update in RemoteControlClient registrationJean-Michel Trivi2013-11-131-3/+2
* | | am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into k...Craig Mautner2013-11-131-0/+1
|\ \ \ | |/ /