summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't play notifications during speech recognition" into jb-mr1-devJean-Michel Trivi2012-10-102-0/+17
|\
| * Don't play notifications during speech recognitionJean-Michel Trivi2012-10-102-0/+17
* | Fix MediaRouter prioritization around a2dp devicesAdam Powell2012-10-101-4/+5
* | Merge "Instead of collecting the procmem output in the test, change it as opt...Yu Shan Emily Lau2012-10-092-38/+41
|\ \ | |/ |/|
| * Instead of collecting the procmem output inYu Shan Emily Lau2012-10-092-38/+41
* | Merge "enforce camera sound according to country code" into jb-mr1-devEric Laurent2012-10-093-38/+182
|\ \
| * | enforce camera sound according to country codeEric Laurent2012-10-083-38/+182
* | | Don't do a wifi p2p scan in MediaRouter if we're already connectedAdam Powell2012-10-081-3/+8
|/ /
* | AudioService: fix settings for fixed volume deviceEric Laurent2012-10-071-7/+24
* | MediaRouter/Wireless Display - correct initial stateAdam Powell2012-10-041-5/+7
* | Throw an exception instead of crash when a surface does not have a binding su...James Dong2012-10-041-0/+5
* | Merge "AudioService: filter flags in volume methods" into jb-mr1-devEric Laurent2012-10-041-1/+3
|\ \ | |/ |/|
| * AudioService: filter flags in volume methodsEric Laurent2012-10-031-1/+3
* | audio service: fix system volume settingsEric Laurent2012-10-021-10/+18
|/
* enable safe media volume according to countryEric Laurent2012-10-021-39/+96
* MediaRouter/Wifi Display improvementsAdam Powell2012-10-011-21/+40
* String change for video routing via MediaRouter; "HDMI" not "HDMI audio."Adam Powell2012-09-281-1/+1
* Add wireless display selection support to MediaRouter.Adam Powell2012-09-281-40/+293
* Merge "Multi-user ringtone playback." into jb-mr1-devJeff Sharkey2012-09-262-2/+4
|\
| * Multi-user ringtone playback.Jeff Sharkey2012-09-262-2/+4
* | Implement android.media.AudioManager.getProperty()Glenn Kasten2012-09-252-2/+15
|/
* Display a fixed volume silder when docked.Eric Laurent2012-09-252-83/+120
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-5/+8
|\
| * Volume keys control music volume after music stopsEric Laurent2012-09-211-5/+8
* | pause music playback when switching user.Eric Laurent2012-09-211-2/+22
|/
* Do not turn safe volume on upon headset connectionEric Laurent2012-09-211-16/+24
* Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-devGlenn Kasten2012-09-201-9/+8
|\
| * Expose android.media.AudioManager.getProperty()Glenn Kasten2012-09-201-9/+8
* | Merge "Add multi user volume management" into jb-mr1-devEric Laurent2012-09-201-28/+64
|\ \ | |/ |/|
| * Add multi user volume managementEric Laurent2012-09-191-28/+64
* | Merge "New API for querying audio properties" into jb-mr1-devGlenn Kasten2012-09-191-0/+29
|\ \
| * | New API for querying audio propertiesGlenn Kasten2012-09-171-0/+29
* | | Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is...Mike Lockwood2012-09-181-3/+6
|\ \ \
| * | | AudioService: Send "becoming noisy" intent when USB accessory audio is discon...Mike Lockwood2012-09-181-3/+6
| | |/ | |/|
* | | am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t ...Mike Lockwood2012-09-181-0/+1
|\ \ \
| * \ \ am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp in...Mike Lockwood2012-09-181-0/+1
| |\ \ \
| | * \ \ Merge "MtpData bmp format file can't recognize when copy bmp into DUT"Mike Lockwood2012-09-181-0/+1
| | |\ \ \
| | | * | | MtpData bmp format file can't recognize when copy bmp into DUTbo huang2012-08-171-0/+1
* | | | | | Merge "Visualizer only works on sounds >5 sec." into jb-mr1-devMarco Nelissen2012-09-181-0/+0
|\ \ \ \ \ \
| * | | | | | Visualizer only works on sounds >5 sec.Marco Nelissen2012-09-181-0/+0
* | | | | | | Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-devMarco Nelissen2012-09-181-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Activity.onStop(Bundle) does not existMarco Nelissen2012-09-171-1/+3
| | |_|_|/ | |/| | |
* | | | | headphone volume limitationEric Laurent2012-09-161-1/+164
|/ / / /
* | | | Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-m...Ruei-sung Lin2012-09-121-5/+1
|\ \ \ \
| * | | | Fix b/7087723 Patch leftover after tapping the red eye areaRuei-sung Lin2012-09-121-5/+1
* | | | | Merge "MtpDatabase: Use actual file size instead of media database size colum...Mike Lockwood2012-09-122-40/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-122-40/+41
* | | | | Merge "EffectsTest enhancements" into jb-mr1-devMarco Nelissen2012-09-126-1/+34
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | EffectsTest enhancementsMarco Nelissen2012-09-116-1/+34
* | | | | Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1...Mike Lockwood2012-09-111-2/+2
|\ \ \ \ \