summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | AudioService: Send "becoming noisy" intent when USB accessory audio is ↵Mike Lockwood2012-09-181-3/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | disconnected Bug: 7051259 Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t ↵Mike Lockwood2012-09-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | recognize when copy bmp into DUT" * commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6': MtpData bmp format file can't recognize when copy bmp into DUT
| * \ \ am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp ↵Mike Lockwood2012-09-181-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into DUT" * commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490': MtpData bmp format file can't recognize when copy bmp into DUT
| | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for bmp format. Change-Id: I67d4703b43cd32abad638bae57bbceb65b4be6de Author: bo huang <bo.b.huang@intel.com> Signed-off-by: bo huang <bo.b.huang@intel.com> Signed-off-by: Wu, Hao <hao.wu@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 24555
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various media framework tests use a Visualizer to look at the output of another effect, but this requires the played file to be longer than 5 seconds. b/4571740 b/7173543 b/7173545 b/7175623 Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
* | | | | | | 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
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since that method doesn't exist, the MediaFrameworkTest wake lock was never released, which caused the test to be killed when the GC collected the still active wake lock. Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
* | | | | headphone volume limitationEric Laurent2012-09-161-1/+164
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit music volume when headphones or headset are inserted. Display warning message when user wants to increase the volume above a platform specific volume and request user acknowledgement before proceeding. TODO: exact wording of the warning message must be defined by UX. Change-Id: I00f429f602534c6d8783126b929371c4d432e6e2
* | | | Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into ↵Ruei-sung Lin2012-09-121-5/+1
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Fix b/7087723 Patch leftover after tapping the red eye areaRuei-sung Lin2012-09-121-5/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
* | | | | Merge "MtpDatabase: Use actual file size instead of media database size ↵Mike Lockwood2012-09-122-40/+41
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | column" into jb-mr1-dev
| * | | | MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-122-40/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems with file transfer from device to host that can occur if the database size value is wrong. Bug: 6954446 Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Merge "EffectsTest enhancements" into jb-mr1-devMarco Nelissen2012-09-126-1/+34
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | EffectsTest enhancementsMarco Nelissen2012-09-116-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the session edit boxes, and make the effects list more readable by translating known effect type UUIDs Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
* | | | | Merge "MtpDatabase: Fix typo affecting parent and format queries" into ↵Mike Lockwood2012-09-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | MtpDatabase: Fix typo affecting parent and format queriesMike Lockwood2012-09-111-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7114350 Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | Add support for controlling remote submix audio routingJean-Michel Trivi2012-09-105-3/+65
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method in AudioManager to control remote submix through AudioService. AudioService controls remote submxi: enabling/disabling remote submix will: - make the sink audio device available/unavailable - make the audio source available/unavailable - force/unforce media streams to be routed to WFD Change-Id: I05d9cc7c3e8a720318ec1385737cbd46a21a3207
* | | | Merge "Add support for Wifi display." into jb-mr1-devJeff Brown2012-09-071-0/+153
|\ \ \ \
| * | | | Add support for Wifi display.Jeff Brown2012-09-071-0/+153
| | | | | | | | | | | | | | | | | | | | Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
* | | | | AudioSystem: new audio device enumsEric Laurent2012-09-071-11/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Update audio device enums to match new definitions in native framework. Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
generated by cgit v1.1 at 2025-01-27 09:05:30 +0000