summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "audio service: make dock audio is off by default" into jb-mr1-devEric Laurent2012-10-291-1/+1
|\
| * audio service: make dock audio is off by defaultEric Laurent2012-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is better to turn dock audio off by default if the user has not yet explicitly turned it on from the settings menu. There is a discoverability issue with current implementation as we do not launch the settings menu at first dock insertion. Having audio routed to the dock by default would make the tablet silent for media content when docked and users will not be directed to the settings menu. As the dock audio enable setting is for low end docks only (analog connection and no jack detection) disabling audio for low end docks by default does not impact manta and prime docks. Bug 7302106. Change-Id: I571f361d41940cfb811f038442ae9ba9c6361d1d
* | No playback and music widget from other user on user switchJean-Michel Trivi2012-10-291-2/+34
|/ | | | | | | | | | | On user switch: - make the current audio focus owner loose audio focus - clear the remote control display Bug 7205290 Bug 7307156 Change-Id: I6ebcb94d1d2bae8c57ab98dd7e795b239a981d28
* Merge "add settings for dock audio enabled" into jb-mr1-devEric Laurent2012-10-271-1/+37
|\
| * add settings for dock audio enabledEric Laurent2012-10-261-1/+37
| | | | | | | | | | | | | | | | | | Add settings dock_audio_media_enabled indicating if dock audio is enabled for media for docks that do not implement jack detection. Bug 7302106. Change-Id: I75766b606ceb870b3f89979c4e3cca88ed197aaf
* | Add MediaRouter API to get presentation display.Jeff Brown2012-10-251-5/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new API makes it possible for an application to ask on which Display it should show a Presentation based on the currently selected media route. Also added a new API on DisplayManager to query displays that support a certain category of uses. Improved the documentation of the Presentation class to explain how to choose an appropriate Display for presentation. Bug: 7409073 Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
* | Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" ↵Bryan Mawhinney2012-10-251-0/+3
|\ \ | |/ |/| | | into jb-mr1-dev
| * Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)Bryan Mawhinney2012-10-241-0/+3
| | | | | | | | Change-Id: Id8fa45aefde85e2ba2b57694b91485ef25e2e5f2
* | AudioService: add fix for corrupted settingsEric Laurent2012-10-231-0/+6
|/ | | | | | | | | | | | Added correction of MODE_RINGER_STREAMS_AFFECTED setting in case it is inconsistent when read from the database: ringtone, notification and system streams are always affected by ringer mode. A corruption of this setting persists accross reboots and propagates via backup/restore causing devices to play notification and ringtones in silent mode. Bug 7384750. Change-Id: I23170413d01e6a8e34ef514f1516d7b9ab8bc656
* More migration to Global settings.Jeff Sharkey2012-10-181-3/+4
| | | | | Bug: 7375796 Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
* Append the test case name in the beginningYu Shan Emily Lau2012-10-171-0/+1
| | | | | | of the test log. Change-Id: I621286274d84bfff474f1cc1e01353b3fd66dc23
* Merge "Fix the NPE for the memwriter." into jb-mr1-devYu Shan Emily Lau2012-10-171-5/+4
|\
| * Fix the NPE for the memwriter.Yu Shan Emily Lau2012-10-171-5/+4
| | | | | | | | Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
* | Merge "Use device availability to start WFD audio routing" into jb-mr1-devJean-Michel Trivi2012-10-152-16/+6
|\ \ | |/ |/|
| * Use device availability to start WFD audio routingJean-Michel Trivi2012-10-112-16/+6
| | | | | | | | | | | | | | | | | | | | | | Don't use the force_use mechanism to start WFD audio routing, but rather only the availability of the remote submix audio device. This is matched by a change in the audio policy manager. Bug 7318180 Change-Id: I756f032d8ca0375c3dbeddb7c321261c497539bc
* | Rewind buffer before copying into it.Marco Nelissen2012-10-121-0/+1
| | | | | | | | | | | | b/7334897 Change-Id: I83f795cb662d0845314bfb80b9a27ae45b2a0517
* | Ensure MediaRouter correctly handles renamed Wifi displays.Jeff Brown2012-10-111-15/+7
|/ | | | | | | | | | | | | Fix a couple of bugs that cause MediaRouter to disconnect from the current Wifi display whenever it is renamed. Added an extra check in WifiDisplayAdapter for identity renames. The Settings app already handles this case but it's good to have the service check for it as well so we don't store unnecessary aliases. Bug: 7310777 Change-Id: I8fddd32ca59f9b798ee31b467b81457508c345f8
* 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
| | | | | | | | | | | | | | | | | | | | | | Add support for querying AudioManager to know whether speech recognition is currently underway. Don't play a notification if speech recognition is underway. Bug 7314859 Change-Id: I1bd013a3168cfe1a6b6dcfd28565e1c3c512eb6a
* | Fix MediaRouter prioritization around a2dp devicesAdam Powell2012-10-101-4/+5
| | | | | | | | | | | | | | | | | | Most recently connected audio output gets priority. Wifi display will dominate over everything. Bug 7324334 Change-Id: I29b59570a2e9b5352be436dc5b7a0a6861dfae6b
* | Merge "Instead of collecting the procmem output in the test, change it as ↵Yu Shan Emily Lau2012-10-092-38/+41
|\ \ | |/ |/| | | optional. This is to avoid the tool breakage will block the whole memory test sutie." into jb-mr1-dev
| * Instead of collecting the procmem output inYu Shan Emily Lau2012-10-092-38/+41
| | | | | | | | | | | | | | the test, change it as optional. This is to avoid the tool breakage will block the whole memory test sutie. Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mcc config overlay mechanism to enforce camera shutter sounds in countries where it is mandatory. Property ro.camera.sound.forced is not needed anymore. When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from streams affected by ringer mode and its volume is maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED. Also fix streams being unmuted when settings are reloaded upon user switch while in silent mode. Add ringer mode to audio service dump. Bug 7032634. Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
* | | Don't do a wifi p2p scan in MediaRouter if we're already connectedAdam Powell2012-10-081-3/+8
|/ / | | | | | | | | | | | | | | | | | | When we're connected to a wifi display already, some configurations might hiccup or otherwise disrupt the media stream if we initiate a new scan. Block the MediaRouter's default scanning behavior if we start up while already connected to a wifi display. (A scan will still occur if the user opens the picker dialog.) Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
* | AudioService: fix settings for fixed volume deviceEric Laurent2012-10-071-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Force max volume for devices with fixed volume policy (HDMI, dock...) when reading the settings from DB. Otherwise, these devices would get the default volume which is not what we want. Also fix a problem related to ringer mode management when reloading the volume settings upon user switch that would cause a muted stream to be unmuted. Bug 7301563; Change-Id: I81cdb97125b845da584ed680181b93c7c1e5903f
* | MediaRouter/Wireless Display - correct initial stateAdam Powell2012-10-041-5/+7
| | | | | | | | | | | | | | | | | | Make sure we get the right initial status for wifi displays when a new display route is first added to the MediaRouter. Bug 7289746 Change-Id: Id41f704fc88021bd4cdf21e9f4b3c810775e1aea
* | Throw an exception instead of crash when a surface does not have a binding ↵James Dong2012-10-041-0/+5
| | | | | | | | | | | | | | | | surface texture o related-to-bug: 7270329 Change-Id: I498d72187968e89d9498d01b10719569e12be2af
* | 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
| | | | | | | | | | | | | | | | | | | | Strip FIXED_VOLUME flag in setStreamVolume() and adjustStreamVolume() as this flag is reserved for framework use. Bug 4335692. Change-Id: I507582270f4c4cd631ee81fe50dca895bb6352b3
* | audio service: fix system volume settingsEric Laurent2012-10-021-10/+18
|/ | | | | | | | | | | | | | STREAM_SYSTEM stream volume is never persisted to settings as it is always derived from another stream volume (STREAM_RING on phones and STREAM_MUSIC on tablets). Therefore values stored in settings are stale from previous releases and should be ignored. Also fix a problem where a muted stream can be unmuted by readAudioSettings() even if it is muted by ringer mode. Bug 7216630. Change-Id: If23561ddfbc704f89fd0a997faf1b50299a50c2e
* enable safe media volume according to countryEric Laurent2012-10-021-39/+96
| | | | | | | | | | Enable safe headphone volume feature for all countries that do not opt otherwise in their mmc configuration. Opt out for US. Bug 7231029. Change-Id: I2619d627508eb2cd1f73db9242e0cb5efa839a2a
* MediaRouter/Wifi Display improvementsAdam Powell2012-10-011-21/+40
| | | | | | | | | | | * Don't select the default route on initialization in a process * Add "connecting" state to MediaRouteButton Bug 7258981 Bug 7262522 Change-Id: I5cd39b09843783b7e1e17620ca33193f0f3b8fca
* String change for video routing via MediaRouter; "HDMI" not "HDMI audio."Adam Powell2012-09-281-1/+1
| | | | Change-Id: Ifece0cf0bc11ff2ffab254c6177f9db741037df6
* Add wireless display selection support to MediaRouter.Adam Powell2012-09-281-40/+293
| | | | | | | | | | | | | | | * Adds the new route type LIVE_VIDEO * Wireless displays support both LIVE_VIDEO and LIVE_AUDIO, making wireless display routes valid selections in when apps make selecting live audio routes available. * MediaRouter will only report/manipulate wireless displays that have already been paired at the system level. Bug 7177920 Change-Id: Ic221b8687d77b4c0df9801c396b74870e86206e9
* Merge "Multi-user ringtone playback." into jb-mr1-devJeff Sharkey2012-09-262-2/+4
|\
| * Multi-user ringtone playback.Jeff Sharkey2012-09-262-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change RingtonePlayer to open content:// Uris based on requesting UserHandle. Grant SystemUI visibility to all emulated storage so it can play ringtones for apps without READ_EXTERNAL_STORAGE. Resolve canonical file:// Uris before passing out of source app, replacing any /emulated_legacy/-style paths with user-specific variant so they can be opened by SystemUI. Calling for RemoteViews, Ringtones, and Notifications. Bug: 7202982 Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
* | Implement android.media.AudioManager.getProperty()Glenn Kasten2012-09-252-2/+15
|/ | | | | Bug: 6635041 Change-Id: I0e7d53b99559cdc89f2f107f23048e4b1a8dd383
* Display a fixed volume silder when docked.Eric Laurent2012-09-252-83/+120
| | | | | | | | | | Align UI indication to volume policy when docked: the music volume cannot be adjusted when docked or connected to HDMI. Display a disabled slider at max volume in this case to be consistent. Bug 4335692. Change-Id: I6f8db143b0e2ecf54e4bdacd88afdeb661a98a18
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-5/+8
|\ | | | | | | Change-Id: Iba23d16643b8754f6e0a7288b2ca242f722f1bdd
| * Volume keys control music volume after music stopsEric Laurent2012-09-211-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | On phones, add a short delay during which volume keys still control music volume after music has stopped. This is similar to the tablet behavior for notifications volume. It allows users to control the prompt volume for talk back, voice search or navigation even after the prompt has stopped. Bug 7162364. Change-Id: Iffbca9ec30ebcbe5846f783ddd260b6e736caf2b
* | pause music playback when switching user.Eric Laurent2012-09-211-2/+22
|/ | | | | | | | | | AudioService sends AudioManager.ACTION_AUDIO_BECOMING_NOISY intent when notified of a user switch to pause music playback for all background users. Bug 7128886. Change-Id: I6a24409533bf40c517c43da25b9baeceb3379cb8
* Do not turn safe volume on upon headset connectionEric Laurent2012-09-211-16/+24
| | | | | | | | | | | It is not a requirement to force headphone volume limitation back on when a headset is plugged in. Only turn it back on when the device is power off or after 20 hours of cumulative music listening. Bug 7064975. Change-Id: Idabd417a9a9b8096552119c0ff528ba193cfdb5d
* 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
| | | | | | | | | | | | | | Also fix minor documentation errors. Bug: 6635041 Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification and Alarm volumes are per user: they are saved and restored when the foreground user changes. Media volume is global: it is still saved and restored per user for implentation reasons but is copied from one user to the next to ensure media playback volume continuity when switching users. Ringer mode (silent, vibrate...) is now a global setting. Bug 7128886. Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
* | 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
| | | | | | | | | | | | | | | Bug: 6635041 Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
* | | Merge "AudioService: Send "becoming noisy" intent when USB accessory audio ↵Mike Lockwood2012-09-181-3/+6
|\ \ \ | | | | | | | | | | | | is disconnected" into jb-mr1-dev
generated by cgit v1.1 at 2025-04-01 22:25:53 +0000