summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\
| * Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...Zhijun He2014-01-311-0/+1
|\ \ | |/
| * Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
| |\
| | * Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
* | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-281-2/+2
|\ \ \ | |/ /
| * | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
| |/
* | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas...Narayan Kamath2014-01-1624-153/+157
|\ \ | |/
| * AArch64: Use long for pointers in media classesAshok Bhat2014-01-1524-153/+157
* | am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \ | |/
| * Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| |\
| | * Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-101-0/+1
|\ \ \ | |/ /
| * | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
| |\ \
| | * | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | |/
* | | 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 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 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 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
* | | 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 be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-182-9/+0
|\ \ \ | |/ /
| * | Remove unused field from MediaMuxerNarayan Kamath2013-12-182-9/+0
| |/
* | 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
* | | 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
| |/
* | 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 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
* | 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 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 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPl...Elliott Hughes2013-11-131-0/+1
|\ \ | |/ |/|
| * am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener:...Elliott Hughes2013-11-131-0/+1
| |\
| | * Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2013-11-131-0/+1
* | | UI tweaks.Jeff Brown2013-11-112-45/+99
* | | Changes to support new screen cast settings screen.Jeff Brown2013-11-101-35/+36
* | | Merge "Update the media router dialogs and integrate into system UI." into kl...Jeff Brown2013-11-111-4/+74
|\ \ \
| * | | Update the media router dialogs and integrate into system UI.Jeff Brown2013-11-101-4/+74
* | | | Fixed a bug updating presentation displays.Chong Zhang2013-11-082-54/+65
|/ / /
* | | Merge "Add media router service and integrate with remote displays." into klp...Jeff Brown2013-11-085-93/+709
|\ \ \