summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* am db44cb92: am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when...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-2031-92/+0
* | am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from init...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
|\ \ | |/
| * Fix RemoteController update in RemoteControlClient registrationJean-Michel Trivi2013-11-131-3/+2
* | am 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-devJeff Brown2013-11-111-45/+68
|\ \ | |/
| * UI tweaks.Jeff Brown2013-11-111-45/+68
* | 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-111-50/+56
|\ \ \ | |/ /
| * | Fixed a bug updating presentation displays.Chong Zhang2013-11-081-50/+56
| |/
* | 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-074-0/+264
|\ \ \ | |/ /
| * | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-084-0/+264
| |\ \ | | |/
| | * Add a platform library for remote display providers.Jeff Brown2013-11-074-0/+264
* | | 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
|\ \ \ | |/ /
| * | Merge "MediaPlayer: MTP: update state only based on source events" into klp-devLajos Molnar2013-10-281-2/+11
| |\ \ | | |/ | |/|
| | * MediaPlayer: MTP: update state only based on source eventsLajos Molnar2013-10-281-2/+11
* | | am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient gener...Jean-Michel Trivi2013-10-251-9/+15
|\ \ \ | |/ /
| * | Merge "Limit RemoteControlClient generation ID changes" into klp-devJean-Michel Trivi2013-10-251-9/+15
| |\ \
| | * | Limit RemoteControlClient generation ID changesJean-Michel Trivi2013-10-241-9/+15
* | | | am 6a3bfe07: am 9c267f8d: am 5504537e: Merge "Missing LoudnessEnhancer constr...Jean-Michel Trivi2013-10-242-3/+0
|\ \ \ \ | |/ / /
| * | | Missing LoudnessEnhancer constructor and UUID in public APIJean-Michel Trivi2013-10-232-3/+0
| |/ /
* | | am 16f495df: am 11c746ab: am a9412556: Merge "Fix stale data in keyguard tran...Adam Powell2013-10-171-0/+1
|\ \ \ | |/ /
| * | Fix stale data in keyguard transport control displayAdam Powell2013-10-151-0/+1
| |/
| * Merge "DO NOT MERGE: Hide new camera API." into klp-devEino-Ville Talvala2013-10-132-13/+2
| |\
| | * DO NOT MERGE: Hide new camera API.Eino-Ville Talvala2013-10-112-13/+2
* | | am 09872a35: am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp...Jean-Michel Trivi2013-10-113-23/+76
|\ \ \ | |/ /
| * | Remote volume changesJean-Michel Trivi2013-10-113-23/+76
| |/
* | am f2177bae: am 2d06e69c: am c04337aa: Merge "Make RemoteController weakly re...Jean-Michel Trivi2013-10-091-17/+52
|\ \ | |/
| * Make RemoteController weakly referenced by IRemoteControlDisplayJean-Michel Trivi2013-10-081-17/+52
* | am 47f698b8: am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info wh...Jean-Michel Trivi2013-10-072-0/+33
|\ \ | |/
| * Update RemoteController info when enabling/disabling itJean-Michel Trivi2013-10-072-0/+33
* | am 9633629b: am 65d57713: am bacb5422: Merge "Also rely on enabled notificati...Jean-Michel Trivi2013-10-078-153/+427
|\ \ | |/
| * Merge "Also rely on enabled notification listeners for RemoteController regis...Jean-Michel Trivi2013-10-078-153/+427
| |\
| | * Also rely on enabled notification listeners for RemoteController registrationJean-Michel Trivi2013-10-048-153/+427
* | | am 02f00de8: am 4b292317: am 15bcc2d8: Merge "audioservice: fix DTMF stream v...Eric Laurent2013-10-041-56/+71
|\ \ \ | |/ /