summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaRecorder: pass capture fps in float"Chong Zhang2015-02-241-4/+1
|\
| * MediaRecorder: pass capture fps in floatChong Zhang2015-02-231-4/+1
| | | | | | | | | | bug: 19460202 Change-Id: I4723c8ed44b4de399de2f3bf051b2d1a4e881910
* | Add MIDI Manager API tweaks:Mike Lockwood2015-02-2313-0/+1355
|/ | | | | | | | - Change the package name from android.midi to android.media.midi - Add option for specifying a Handler for DeviceCallback notifications Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
* Changing AudioManager.listAudioDevicePorts to take a ↵Paul McLean2015-02-192-7/+6
| | | | | | ArrayList<AudioDevicePort> argument. Change-Id: Ide9a2f58a7544e263600e100ba4274403201c5fa
* Merge "Audio Device Enumeration API."Paul McLean2015-02-192-0/+300
|\
| * Audio Device Enumeration API.Paul McLean2015-02-192-0/+300
| | | | | | | | Change-Id: Ic78fda8b2a6f6ac0f37a1f665b29f3359cfc5ecc
* | Merge "AudioAttributes: introduce new flags to bypass audio restrictions."John Spurlock2015-02-194-1/+28
|\ \ | |/ |/|
| * AudioAttributes: introduce new flags to bypass audio restrictions.John Spurlock2015-02-184-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New @hidden @SystemApi FLAG_BYPASS_INTERRUPTION_POLICY, request to ignore any current audio restrictions, such as zen mode content-based notification filtering. - Wire up FLAG_BYPASS_INTERRUPTION_POLICY to the existing audio restriction checks in the framework. - New @hidden @SystemApi FLAG_BYPASS_MUTE, request to play audibly, even if the underlying stream is muted. - Wiring up to audio framework TBD. - Use both of these new flags on the inline volume slider controls used in Settings, ensuring playback is heard regardless of the current device filter state. Bug: 19407114 Change-Id: I3d44394931592ccbc1b61ddd9a4d1cc984da17cc
* | Add @ResourceInt annotations on APIsTor Norbye2015-02-181-2/+3
|/ | | | Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
* Volume: Allow dialog to query "muteable" streams.John Spurlock2015-02-172-0/+15
| | | | | | | | Similar to the existing ability to query streams affected by ringer mode. Bug:19260237 Change-Id: I76eb5ab6b7c7e3a4d73ac1909289c560194d4fe8
* Merge "Allow sysui-managed remote volume controllers."John Spurlock2015-02-131-2/+2
|\
| * Allow sysui-managed remote volume controllers.John Spurlock2015-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Relax restriction on audio service calls that assume the volume ui is systemui, allow calls from a blessed component app. - Blessed component app service saved in secure settings. - SystemUI mediates requests to replace the volume dialog, prompts the user on activation. - Show a low pri ongoing notification when the volume dialog is being replaced, to allow user restoration at any time. - Replace the controller management code in VolumeUI to use a ServiceMonitor, backed by the new blessed app component setting. - Add proper zen-related noman client wrappers, make avail to the registered volume controller. - Everything is still @hidden, no api impact. Bug: 19260237 Change-Id: Ie1383f57659090318a7eda737fdad5b8f88737d4
* | Merge "media: discard duplicate CEA-608 ctrl code"Chong Zhang2015-02-111-1/+11
|\ \ | |/ |/|
| * media: discard duplicate CEA-608 ctrl codeChong Zhang2015-02-091-1/+11
| | | | | | | | | | bug: 19297083 Change-Id: I6c108e2c597e7b3fd770306a26e110208dc5ece0
* | Move AudioService to services.John Spurlock2015-02-099-8903/+136
| | | | | | | | | | | | ...and a few dependencies. Move remaining shared items to AudioSystem. Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5
* | Merge "Delay unmuting on volume down"RoboErik2015-02-091-10/+55
|\ \ | |/ |/|
| * Delay unmuting on volume downRoboErik2015-02-091-10/+55
| | | | | | | | | | | | | | | | This allows the user to turn the volume down before a stream is unmuted by delaying the unmute call while volume down requests are still being made. bug:19297183 Change-Id: I65a8e489eb4cbfeace4f539103ee0025584102da
* | am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev ↵Chong Zhang2015-02-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: eceae03 automerge: 3968f0c * commit '3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225': reset col position to 1 on row PAC
| * \ am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: eceae03 * commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a': reset col position to 1 on row PAC
| | * \ Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| | |\ \
| | | * | reset col position to 1 on row PACChong Zhang2015-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 19284568 Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
* | | | | Merge "Make isStreamMute correctly handle master volume devices"RoboErik2015-02-051-1/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make isStreamMute correctly handle master volume devicesRoboErik2015-02-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isStreamMute should return the master mute value if mUseMasterVolume is true. This adds that check. Change-Id: I6d5f5552c480028972e69ff9d670e10c4e496d05
* | | | | Merge "Add additional info to AudioPort for enum/selection API."Paul McLean2015-02-058-38/+115
|\ \ \ \ \
| * | | | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-048-38/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Parse out USB Device name in UsbCardsParser. Change-Id: Ifd76b0298312090a8f39e638339f993b86d47080
* | | | | | Merge "Use shared value for default muteable streams."John Spurlock2015-02-051-5/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use shared value for default muteable streams.John Spurlock2015-02-051-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8fa7aee3bed83fc26945fd0caf0cbd9f4f8af3a
* | | | | | Merge "MediaCodecInfo: remove stack trace logspam when querying invalid sizes"Lajos Molnar2015-02-041-4/+4
|\ \ \ \ \ \
| * | | | | | MediaCodecInfo: remove stack trace logspam when querying invalid sizesLajos Molnar2015-01-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ed3825f17cacb0502c40483462f1d76f92e5efa
* | | | | | | am b86a4558: am 015fdf39: Merge "audio: allow audio port cache update even ↵Wonsik Kim2015-02-031-7/+24
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd * commit 'b86a45588a67f88730c15c82f624cd64fe1da80c': audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
| * | | | | | am 015fdf39: Merge "audio: allow audio port cache update even when audio ↵Wonsik Kim2015-02-031-7/+24
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd * commit '015fdf392388f1bed3298f9f44012c1a82d7c1a1': audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
| | * | | | | audio: allow audio port cache update even when audio patches contain ↵Wonsik Kim2015-01-311-7/+24
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalidated sources/sinks When an audio device disconnects from Android, custom audio patches containing the device become invalidated. AudioManager::updateAudioPortCache() used to fail in that case, but it causes onAudioPortListUpdated() event never gets called so that the creator of the custom audio patch cannot update it. Let updateAudioPortCached() succeed even in the case so that the entity that created the audio patch can get notified. Bug: 18909299 Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
* | | | | | Merge "AudioAttributes javadoc update for conversion to stream types"Jean-Michel Trivi2015-02-031-1/+7
|\ \ \ \ \ \
| * | | | | | AudioAttributes javadoc update for conversion to stream typesJean-Michel Trivi2015-02-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b687d8a002897fff90a8c99d180aa0a3511a571
* | | | | | | TIF: Add a comment to remove padding around the channel logo imageJae Seo2015-02-031-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19066924 Change-Id: Ibb1efb945550028be4106ead826b1e152e488c92
* | | | | | Merge "Clarify that flush does not necessarily free up buffer space"Glenn Kasten2015-02-021-1/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Clarify that flush does not necessarily free up buffer spaceGlenn Kasten2015-02-021-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f77efb6a8da5e11c0cc68f0bb3ce47a0c1cb3da
* | | | | | Merge "Route volume keys directly to the audio system on TVs"RoboErik2015-02-022-13/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Route volume keys directly to the audio system on TVsRoboErik2015-01-292-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This routes volume and mute keys directly to the audio system when on a television instead of letting apps or sessions intercept them. Change-Id: I2af47e30c7842aca96d045a6cc9ca025b94e546a
* | | | | | Merge "Move mute/unmute handling to adjust volume paths"RoboErik2015-01-306-301/+185
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-296-301/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no longer supported and muting is redirected through the adjust volume APIs. Also updates the hidden master versions of these APIs. Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
* | | | | Merge "ImageReader: add support for compatible flexYUV buffers" into ↵Lajos Molnar2015-01-291-0/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 automerge: df876a1 * commit 'df876a110c4b6d55b4a9df57621aa38ff06c6de8': ImageReader: add support for compatible flexYUV buffers
| * | | | Merge "ImageReader: add support for compatible flexYUV buffers" into ↵Lajos Molnar2015-01-291-0/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00 * commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395': ImageReader: add support for compatible flexYUV buffers
| | * | | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
* | | | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the ↵Jae Seo2015-01-291-9/+27
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | session is already released automerge: 4980163 * commit '49801634e46bdba633aba6f7944f0417496b38ce': TIF: Do not call session callbacks when the session is already released
| * | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the ↵Jae Seo2015-01-291-9/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | session is already released * commit '4b1e5814d18dae8f2581cf702da4b4e1de0c3eb4': TIF: Do not call session callbacks when the session is already released
| | * | TIF: Do not call session callbacks when the session is already releasedJae Seo2015-01-281-9/+27
| | | | | | | | | | | | | | | | | | | | Bug: 19146382 Change-Id: I5592d4bf033478e5e5e1013bd2ad5ea572df44dd
* | | | Merge "Add getMediaItem API to MediaBrowser"RoboErik2015-01-283-21/+163
|\ \ \ \
| * | | | Add getMediaItem API to MediaBrowserRoboErik2015-01-263-21/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds all the plumbing for supporting a getMediaItem call in MediaBrowser. Will also need to add a support lib component to make it backward compatible. Change-Id: I528e9ebaf4e0fe386f346ef85c14973168a380df
* | | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-271-7/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | automerge: 6e14c57 * commit '6e14c5705c5acf9d6036060252f257a084cd7578': Make SoundPool use MediaCodec
generated by cgit v1.1 at 2024-09-21 21:36:32 +0000