summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am b263500a: am 42da57f1: am d4c2499c: Merge "Allow empty strings in playFrom...RoboErik2014-09-032-5/+12
|\
| * Merge "Allow empty strings in playFromSearch" into lmp-devRoboErik2014-09-032-5/+12
| |\
| | * Allow empty strings in playFromSearchRoboErik2014-09-022-5/+12
* | | am a241a83d: am 720c772a: am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into...RoboErik2014-09-031-2/+3
|\ \ \ | |/ /
| * | Merge changes Id38bcf7c,I54f156d9 into lmp-devRoboErik2014-09-031-2/+3
| |\ \ | | |/
| | * Update MediaController comment to mention notification listenersRoboErik2014-09-021-2/+3
* | | am 8271173e: am 4a948322: am befc4c11: Merge "Make stream_music volume config...Jungshik Jang2014-09-031-0/+3
|\ \ \ | |/ /
| * | Merge "Make stream_music volume configurable." into lmp-devJungshik Jang2014-09-021-0/+3
| |\ \ | | |/ | |/|
| | * Make stream_music volume configurable.Jungshik Jang2014-09-011-0/+3
* | | am f2bdd3fc: am 22a14cd2: am 73db0682: Merge "Restore permission check for mi...Jean-Michel Trivi2014-09-031-0/+3
|\ \ \ | |/ /
| * | Merge "Restore permission check for mic muting" into lmp-devJean-Michel Trivi2014-09-021-0/+3
| |\ \
| | * | Restore permission check for mic mutingJean-Michel Trivi2014-09-021-0/+3
* | | | am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Cal...Michael Wright2014-09-021-6/+6
|\ \ \ \ | |/ / /
| * | | Merge "VirtualDisplay.Callbacks -> Callback" into lmp-devMichael Wright2014-09-021-6/+6
| |\ \ \
| | * | | VirtualDisplay.Callbacks -> CallbackMichael Wright2014-09-011-6/+6
* | | | | am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from ...Jean-Michel Trivi2014-09-022-9/+129
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" i...Jean-Michel Trivi2014-09-022-9/+129
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Move *_AUDIO_PLUG actions from Intent to android.media.AudioManagerJean-Michel Trivi2014-08-292-9/+129
* | | | | am 50ac3f3c: am eaa9befb: am e4999af8: Merge "API: Document android-allow-cro...Ronghua Wu2014-09-021-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and V...Ronghua Wu2014-09-021-0/+4
| |\ \ \ \
| | * | | | API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoViewRonghua Wu2014-08-251-0/+4
* | | | | | am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use Stri...RoboErik2014-09-024-112/+103
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-devRoboErik2014-09-024-112/+103
| |\ \ \ \ \
| | * | | | | Update MediaBrowser to use String ids instead of UrisRoboErik2014-08-294-112/+103
* | | | | | | am a49159c5: am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for C...Jae Seo2014-09-021-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp...Jae Seo2014-09-021-2/+2
| |\ \ \ \ \ \
| | * | | | | | TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGEJae Seo2014-09-011-2/+2
* | | | | | | | am 74052580: am 057043e7: am e42eaea7: Merge "TIF: Fix the Singapore content ...Jae Seo2014-09-021-15/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "TIF: Fix the Singapore content ratings" into lmp-devJae Seo2014-09-021-15/+19
| |\ \ \ \ \ \ \
| | * | | | | | | TIF: Fix the Singapore content ratingsJae Seo2014-09-021-15/+19
| | |/ / / / / /
* | | | | | | | am ff1f473c: am 9586eaa4: am d15591a7: Merge "Do not show the input icon when...Sungsoo Lim2014-09-021-7/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Do not show the input icon when it's not available." into lmp-devSungsoo Lim2014-09-021-7/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Do not show the input icon when it's not available.Sungsoo Lim2014-09-021-7/+10
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 49420725: am 53cb1592: am 3366cb62: Merge "TIF: add SystemApi\'s for ITvIn...Wonsik Kim2014-09-021-0/+125
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | TIF: add SystemApi's for ITvInputHardware related methodsWonsik Kim2014-09-021-0/+125
| |/ / / / /
* | | | | | am 007ac9cd: am 669ad493: am 3b5096be: Merge "Add missing checks for the curr...Ji-Hwan Lee2014-09-021-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add missing checks for the current session callbackJi-Hwan Lee2014-08-301-0/+6
* | | | | | am f38342e8: am ff09c60d: am ba5fd177: Merge "Tunneled Video Playback: Fixed ...Rachad2014-09-021-5/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio ...Rachad2014-08-301-5/+8
| |\ \ \ \ \
| | * | | | | Tunneled Video Playback:Rachad2014-08-281-5/+8
* | | | | | | am 2277a066: am 4525b6f7: am 8a8afdfa: Merge "TIF: Fix comment on TvContentRa...Jae Seo2014-09-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "TIF: Fix comment on TvContentRating" into lmp-devJae Seo2014-08-301-1/+1
| |\ \ \ \ \ \
| | * | | | | | TIF: Fix comment on TvContentRatingJae Seo2014-08-291-1/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 85a4839e: am e9fbaa4e: am 169739a7: Merge "Document MediaSession.Callback....RoboErik2014-09-021-0/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" int...RoboErik2014-08-291-0/+10
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Document MediaSession.Callback.onMediaButtonEvent and add returnsRoboErik2014-08-291-0/+10
* | | | | | | am 3fe37375: am d06311db: am 75d95d4c: Merge "Replace "Comment" to "Descripti...Andrew Jeon2014-09-021-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Replace "Comment" to "Description" since description makes more sense inAndrew Jeon2014-08-291-4/+4
| | |/ / / / | |/| | | |
* | | | | | am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string fo...Jeff Tinker2014-08-291-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix exception message string formatting in MediaDrm" into lmp-devJeff Tinker2014-08-291-2/+2
| |\ \ \ \ \