summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" ↵Jean-Michel Trivi2014-12-0810-95/+731
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd14f98fdcec65daae9f4db04f827036e5317b55c': Support collaborative audio focus handling
| * | | | | Merge "Support collaborative audio focus handling" into lmp-mr1-devJean-Michel Trivi2014-12-0710-95/+731
| |\ \ \ \ \
| | * | | | | Support collaborative audio focus handlingJean-Michel Trivi2014-12-0510-95/+731
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new flag for an app to define it doesn't duck, but rather pauses when losing focus with AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK. This flag is to be used when requesting focus. Add support for AudioPolicy to specify whether it will implement ducking itself, rather than it being handled by an app. When ducking is handled by a policy, do not notify focus owners when they lose audio focus with LOSS_TRANSIENT_CAN_DUCK, unless they would have paused, as expressed with the AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS flag. Add a focus listener for a policy to be notified of focus changes so it can properly implement its own ducking. Bug 16010554 Change-Id: I11d7cdb85c52fd086128a44f4d938aaa44db5c25
* | | | | | | am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-devJeff Tinker2014-12-081-4/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1': Unhide secure stop APIs
| * | | | | | Unhide secure stop APIsJeff Tinker2014-12-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c related-to-bug: 18053197 related-to-bug: 18076411
* | | | | | | am 2d7a1b09: am d386d0f3: Merge "Route mute key events through ↵RoboErik2014-12-085-16/+83
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaSessionService" into lmp-mr1-dev * commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7': Route mute key events through MediaSessionService
| * | | | | | Merge "Route mute key events through MediaSessionService" into lmp-mr1-devRoboErik2014-12-055-16/+83
| |\ \ \ \ \ \
| | * | | | | | Route mute key events through MediaSessionServiceRoboErik2014-12-055-16/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sends mute keys to the MediaSessionService and handles them by toggling the appropriate stream. Muting remote playback is still not supported. bug:17501993 Change-Id: I18c5b037cde2175acbb64b118dd708514acfd8c9
* | | | | | | | am e9905bd4: am f58a9091: Merge "Make setting the session token in ↵RoboErik2014-12-081-7/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaBrowserService synchronous" into lmp-mr1-dev * commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a': Make setting the session token in MediaBrowserService synchronous
| * | | | | | | Merge "Make setting the session token in MediaBrowserService synchronous" ↵RoboErik2014-12-051-7/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | into lmp-mr1-dev
| | * | | | | Make setting the session token in MediaBrowserService synchronousRoboErik2014-12-041-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MusicDemo was depending on the fact that setting the session token is done synchronously and that getSessionToken can be called immediately after. This makes setting the token synchronous again but leaves the post to update any MediaBrowsers that are waiting on a connection. This does introduce a small race condition if an app tries to set it twice from different threads, but this is a very unlikely situation and MediaBrowserService is not guaranteed to be thread safe. bug:18603085 Change-Id: Id934c9f3b6520225cd92d1d8a6e2b3d606b8c6c8
* | | | | | | am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune ↵Dongwon Kang2014-12-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation which was too harsh" into lmp-mr1-dev * commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c': TIF: increase the time threshold for tune operation which was too harsh
| * | | | | | Merge "TIF: increase the time threshold for tune operation which was too ↵Dongwon Kang2014-12-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | harsh" into lmp-mr1-dev
| | * | | | | | TIF: increase the time threshold for tune operation which was too harshDongwon Kang2014-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18612616 Change-Id: I62ddde2f9796f3b1dd8240f5c88fbff234b3618b
* | | | | | | | am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling ↵Lajos Molnar2014-12-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rates" into lmp-mr1-dev * commit '2b6dc199432a574d8655734865b0d75d2140fd8c': media: allow full range of Vorbis sampling rates
| * | | | | | | media: allow full range of Vorbis sampling ratesLajos Molnar2014-12-041-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
* | | | | | | am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"Chih-hung Hsieh2014-12-041-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '0ebbfaedd7fd843229d289baa69fffd33eab2985': Add -Wno-unused-parameter to LOCAL_CFLAGS
| * | | | | | Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"Chih-hung Hsieh2014-12-041-1/+1
| |\ \ \ \ \ \
| | * | | | | | Add -Wno-unused-parameter to LOCAL_CFLAGSBernhard Rosenkränzer2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some JNI functions ignore the JNI environment and class information, but still take the parameters -- causing a build failure with clang (and gcc with -Wextra enabled). Ignore this. Change-Id: I049fcf65991b19d2416fce105699311803b43cfc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | | am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into ↵Dongwon Kang2014-12-031-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '25a051880666022163b9a641737f26adc31e5477': TIF: call tune() in HardwareSession
| * | | | | | | Merge "TIF: call tune() in HardwareSession" into lmp-mr1-devDongwon Kang2014-12-031-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | TIF: call tune() in HardwareSessionDongwon Kang2014-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background: The underlying passthrough TV input expects tune() command to show video on the screen and call notifyVideoAvailable(). Bug: 18551619 Change-Id: I257db321c09d621e6bd3c0e69bfe0abfca5742a9
* | | | | | | | | am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection ↵Michael Wright2014-12-031-5/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks." into lmp-mr1-dev * commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1': Correctly iterate through MediaProjection callbacks.
| * | | | | | | | Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-devMichael Wright2014-12-031-5/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Correctly iterate through MediaProjection callbacks.Michael Wright2014-11-211-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18393320 Change-Id: I81e46b516e4e94b04a1b8363805b8bb633cb822e
* | | | | | | | | am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion ↵Jean-Michel Trivi2014-12-027-66/+397
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API, dynamic source" into lmp-mr1-dev * commit '874e4502217aa48a06171a7d880b9ca571fd76b1': AudioMix address and type, rule exclusion API, dynamic source
| * | | | | | | | Merge "AudioMix address and type, rule exclusion API, dynamic source" into ↵Jean-Michel Trivi2014-12-027-66/+397
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | AudioMix address and type, rule exclusion API, dynamic sourceJean-Michel Trivi2014-11-307-66/+397
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Simplify API for defining an exclusion-based rule: don't define an exclusion rule, add instead a way to exclude a rule. - API for defining rules for dynamic sources (rule match on capture preset). - Verify mix type when creating AudioRecord or AudioTrack for a mix. - Use hashcode of mix for generating the device address. - AudioService dump prints info about registered policies. - Annotate as SystemApi the audio policy-related APIs. - Express mixing match and exclude rule constants as flags for future-proofness Bug 16006090 Bug 16009464 Change-Id: I0dabe71204501acaffea7ef0ddbbab9700e1bd87
* | | | | | | | | am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in ↵Jinsuk Kim2014-12-021-47/+59
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master volume mode" into lmp-mr1-dev * commit 'bfe763d1c96fe0f8e704743160a478d2e698a801': audioservice: system audio control in master volume mode
| * | | | | | | | Merge "audioservice: system audio control in master volume mode" into ↵Jinsuk Kim2014-12-021-47/+59
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | audioservice: system audio control in master volume modeJinsuk Kim2014-12-011-47/+59
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume control in master mode should be transformed to CEC commands if system audio is activated to delegate the control to the connected AV receiver. Refactored to use the interface to CEC service for both master and stream type volume control. Bug: 18560079 Change-Id: I2aefdc94a1bc3091c14fab849f899a0dc37c47bc
* | | | | | | | | am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when ↵Dongwon Kang2014-12-022-1/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvInputManager is initialized" into lmp-mr1-dev * commit '3599af39e45af0498daa4873216a8cf4d6fe67f9': TIF: fix a race condition when TvInputManager is initialized
| * | | | | | | | Merge "TIF: fix a race condition when TvInputManager is initialized" into ↵Dongwon Kang2014-12-022-1/+23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | TIF: fix a race condition when TvInputManager is initializedDongwon Kang2014-12-022-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, TvInputManagerService notifies the initial state of each input via TvInputManagetCallback#onInputStateChanged after TvInputManager is created. However, this is racy because the client may call methods like getTvInputState() before the initialization. This patch makes sure that the client gets the control when the initialization finishes completely. Bug: 18419452 Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
* | | | | | | | | | am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" ↵Sungsoo Lim2014-12-021-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '1f35568d075e8c0401e3b00591dde2f6f3218b48': Missing Javadoc update while API review
| * | | | | | | | | Merge "Missing Javadoc update while API review" into lmp-mr1-devSungsoo Lim2014-12-021-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Missing Javadoc update while API reviewSungsoo Lim2014-11-281-2/+2
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18550989 Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
* | | | | | | | | | am c8d1b107: am 217814bf: Merge "ImageReader: free direct byte buffers once ↵Zhijun He2014-12-021-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image is returned" into lmp-mr1-dev * commit 'c8d1b107b0c05157b102be61c43131dd6992aad2': ImageReader: free direct byte buffers once Image is returned
| * | | | | | | | | ImageReader: free direct byte buffers once Image is returnedZhijun He2014-12-011-0/+10
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can prevent apps from accessing an image byte buffer when it is closed. Bug: 12528089 Change-Id: I04dccf1832204be2ae3aeb3bbe04f616886447e6
* | | | | | | | | am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used ↵John Spurlock2014-12-013-18/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in settings." into lmp-mr1-dev * commit '23a99a3ab09d90e3613b44a0962de7ed0028d620': Volume: Improve inline volume controls used in settings.
| * | | | | | | | Merge "Volume: Improve inline volume controls used in settings." into ↵John Spurlock2014-12-013-18/+23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | Volume: Improve inline volume controls used in settings.John Spurlock2014-11-283-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make the system internal ringer mode change signal available to other system components via a standard intent, instead of a volume-controller-only binder call. - Update sysui to use new intent for icon policy. - Add proper muting state to the volumizer, to look more like the associated volume panel slider. - Add basic ringer mode state tracking for the notification-ring slider setting. Bug: 17899613 Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
* | | | | | | | | | am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is ↵Wally Yau2014-12-011-8/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to true. * commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9': Set stream volume to max when userMasterVolume is set to true.
| * | | | | | | | | Set stream volume to max when userMasterVolume is set to true.Wally Yau2014-11-281-8/+8
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When useMasterVolume is set, we don't want to apply the volume attenuation twice, once at the stream mixer and once at the master volume control. It should only be applied once at the master volume control. Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0 Fixed: b/18460548
* | | | | | | | | am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in ↵Jinsuk Kim2014-11-261-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master volume mode" into lmp-mr1-dev * commit 'c69c8dc15972179728932f91dde483e9d61f34a9': Do not perform forceVolumeControlStream in master volume mode
| * | | | | | | | Merge "Do not perform forceVolumeControlStream in master volume mode" into ↵Jinsuk Kim2014-11-261-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | Do not perform forceVolumeControlStream in master volume modeJinsuk Kim2014-11-261-0/+3
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method should be no-op when in master volume mode. Bug: 18250921 Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
* | | | | | | | | am 9bde6e41: am a181da10: Merge "Fix broken @see javadoc in android.media.* ↵Lajos Molnar2014-11-264-12/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes" into lmp-mr1-dev * commit '9bde6e419e2521e67975c8ab84c12cbf6d983f66': Fix broken @see javadoc in android.media.* classes
| * | | | | | | | Fix broken @see javadoc in android.media.* classesRyan Lothian2014-11-264-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL fixes all android.media.* javadoc that includes an "ERROR(...)" message when rendered to HTML. Bug: 18537403 Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905 (cherry picked from commit d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
* | | | | | | | | am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write ↵Andy Hung2014-11-261-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for static AudioTracks" into lmp-mr1-dev * commit 'feeaa0ba547188453b668a2b1ef80fd6c7dd3a9a': Allow set loop and position before write for static AudioTracks
generated by cgit v1.1 at 2025-02-10 06:38:30 +0000