summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | 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
* | | | am 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-devJeff Brown2013-11-112-45/+99
|\ \ \ \ | |/ / /
| * | | UI tweaks.Jeff Brown2013-11-112-45/+99
* | | | am fa0d9c2f: am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen c...Jeff Brown2013-11-111-35/+36
|\ \ \ \ | |/ / /
| * | | Changes to support new screen cast settings screen.Jeff Brown2013-11-101-35/+36
* | | | resolved conflicts for merge of f0b9ee96 to masterJeff Brown2013-11-111-4/+74
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 9a05e846: am f32962a8: am e8d0fbf2: Merge "Fixed a bug updating presentati...Chong Zhang2013-11-112-54/+65
|\ \ \ \ \ | |/ / / /
| * | | | Fixed a bug updating presentation displays.Chong Zhang2013-11-082-54/+65
| |/ / /
* | | | am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and in...Jeff Brown2013-11-075-93/+709
|\ \ \ \ | |/ / /
| * | | Merge "Add media router service and integrate with remote displays." into klp...Jeff Brown2013-11-085-93/+709
| |\ \ \
| | * | | Add media router service and integrate with remote displays.Jeff Brown2013-11-075-93/+709
* | | | | am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for remo...Jeff Brown2013-11-079-0/+902
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-089-0/+902
| |\ \ \ \ | | |/ / /
| | * | | Add a platform library for remote display providers.Jeff Brown2013-11-079-0/+902
* | | | | Merge "Revert "Add "throws IOException" to MediaCodec constructors (3)""Andy Hung2013-11-071-27/+6
|\ \ \ \ \
| * | | | | Revert "Add "throws IOException" to MediaCodec constructors (3)"Andy Hung2013-11-071-27/+6
* | | | | | Merge "Add "throws IOException" to MediaCodec constructors (3)"Andy Hung2013-11-071-6/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add "throws IOException" to MediaCodec constructors (3)Andy Hung2013-11-051-6/+27
* | | | | | am 1a231f5f: am e661b541: am 7791b84c: Merge "AudioService: fix notifications...Eric Laurent2013-11-061-7/+18
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | AudioService: fix notifications with A2DP abs volumeEric Laurent2013-11-041-7/+18
* | | | | am f57530e4: am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state ...Lajos Molnar2013-10-281-2/+11
|\ \ \ \ \ | |/ / / /