8781 Commits

Author SHA1 Message Date
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
2014-12-01 19:47:58 +00:00
Wally Yau
4b187a2810 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9':
  Set stream volume to max when userMasterVolume is set to true.
2014-12-01 19:46:11 +00:00
John Spurlock
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00
Wally Yau
da39290460 Set stream volume to max when userMasterVolume is set to true.
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
2014-11-28 12:40:30 -08:00
John Spurlock
bcc1087af4 Volume: Improve inline volume controls used in settings.
- 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
2014-11-28 15:29:21 -05:00
Jinsuk Kim
f657463a50 am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode
2014-11-26 21:39:08 +00:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Lajos Molnar
0eaee607b8 am 9bde6e41: am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev
* commit '9bde6e419e2521e67975c8ab84c12cbf6d983f66':
  Fix broken @see javadoc in android.media.* classes
2014-11-26 20:02:41 +00:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes
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)
2014-11-26 18:49:01 +00:00
Andy Hung
e356600772 am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev
* commit 'feeaa0ba547188453b668a2b1ef80fd6c7dd3a9a':
  Allow set loop and position before write for static AudioTracks
2014-11-26 18:42:44 +00:00
Eric Laurent
24a9ddde72 am 29722231: am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev
* commit '297222315e90021497eee4ef6014f463fab96c6a':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
2014-11-26 18:01:04 +00:00
Lajos Molnar
d4604b4fd3 am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev
* commit 'c60a5d781a5e9f927d5971f2127cada9d213a128':
  media: add support for 160-byte image info in MediaCodec
2014-11-26 12:02:50 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
2014-11-26 12:01:35 +00:00
Jinsuk Kim
57d766f533 Do not perform forceVolumeControlStream in master volume mode
The method should be no-op when in master volume mode.

Bug: 18250921

Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
2014-11-26 17:02:18 +09:00
Andy Hung
f32d06d855 Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 2014-11-26 02:04:45 +00:00
Eric Laurent
e511ddce43 Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 2014-11-25 22:28:17 +00:00
Lajos Molnar
3ed95fe258 Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 2014-11-25 22:09:36 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
2014-11-25 19:04:05 +00:00
Chih-hung Hsieh
243a42a799 am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
2014-11-25 19:03:57 +00:00
RoboErik
351ab57e25 am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev
* commit 'a90310256476868d51811eb41c2c7f9b609dc0dc':
  Delay calling onConnected until a session is set in MediaBrowser
2014-11-25 18:43:37 +00:00
John Spurlock
661f2cf458 VolumeZen: Introduce internal vs external ringer mode.
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
 - Internal ringer mode: Used for underlying stream muting
 - External ringer mode: Reported to clients

The mapping between external ringer mode + zen is:
 - normal = all
 - vibrate = all
 - silent = priority (read-write) or none (read)

Changes include:
 - Remove "zen check" from audio service, back to audio
   service having no knowledge of zen.
 - Maintain a new external ringer mode in audio service,
   this is the ringer mode reported through AudioManager
   to callers, also mapped to the change intent.
 - Introduce a "ringer mode delegate" to the local
   audio manager interface, responsible for observing
   external / internal mode changes, and making changes
   if necessary.
 - Internal ringer mode changes are still interesting
   to the volume dialog, wire up a callback through
   the existing IVolumeController interface.
 - On devices without vibration, the mapping is the same
   but since no ringer mode change is possible, disable
   the icon toggle and remove the mute icon when volume=0.
 - On devices with vibration, volume down presses should
   pulse the vibrate icon (and vibrate) as a hint that this
   is as low as the device can go using the keys.  Since
   the mechanics are similar to the existing zen=none hint,
   pull into shared helper.
 - Log ringer mode changes to the zen log, include calling
   package information for issue diagnosis.
 - Include whether vibration is supported in the audio service
   dump.
 - Update the status bar icon policy to use the internal ringer
   mode, not the external mode (for vibrate icon).
 - Update the "Muted by <x>" logic, include current suppressor
   in dumpsys, ensure suppression icon is enabled & !clickable,
   regardless of zen mode.

Bug: 17884168
Bug: 15471679
Bug: 16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
2014-11-25 13:20:46 -05:00
Jean-Michel Trivi
e19bb5c092 am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev
* commit '213472d7384c9d8096748f3cd9305ef49342dbcf':
  Add support for audio focus locking
2014-11-25 17:49:46 +00:00
Lajos Molnar
5037f945cd media: add support for 160-byte image info in MediaCodec
Some 64-bit compilers now create 160-byte image structures.

Bug: 18513091
Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
2014-11-24 21:54:27 -08:00
Andy Hung
78bfa6322b Allow set loop and position before write for static AudioTracks
Allow setPlaybackHeadPosition and setLoopPoints in STATE_NO_STATIC_DATA
for consistency with other setters and older Android versions (JB).

Bug: 18217633
Change-Id: Id8ada3056540c4dfcb89f8afa887159e48db0263
2014-11-24 17:29:52 -08:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
Bernhard Rosenkränzer
99d61edfda Fix class vs. struct mismatch
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)

Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 16:18:15 -08:00
RoboErik
d9bb296b56 Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 2014-11-24 23:04:59 +00:00
RoboErik
d64c425f32 Delay calling onConnected until a session is set in MediaBrowser
This will delay all calls to onConnected from the MediaBrowserService
until a session token has been set. This also requires making it an
exception to try setting the session twice.

bug:18052336
Change-Id: Iecf186c53364183e1696af83a855c8db3294a5d0
2014-11-24 12:35:20 -08:00
Jean-Michel Trivi
958876fe55 Add support for audio focus locking
New API for a registered AudioPolicy to lock/unlock the audio
  focus stack and prevent any new grant of focus, similar to
  the way phone calls behave.

Bug 16010554

Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
2014-11-24 10:46:12 -08:00
Lajos Molnar
0b10f9c0ab am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit '63845f1b5853aa3a84df4a161f6c8e96b98fba8a':
  media: fix isSupportedFormat for integer frame rate
2014-11-24 18:05:46 +00:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-23 22:24:32 +01:00
Andreas Gampe
307218c7f2 resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp
Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9
2014-11-21 09:57:52 -08:00
Andreas Gampe
ed368be792 Merge "Frameworks/base: Wall Werror in media/tests" 2014-11-21 17:39:33 +00:00
Jean-Michel Trivi
c229c3935c am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev
automerge: 14b9092

* commit '14b909241fe4f43ca481e9cd367dd641fe395ff1':
  Convert record channel mask for dynamic mix
2014-11-21 02:49:43 +00:00
Jae Seo
cfaac8d154 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev
* commit '12c03e3386db46f2452dd7642771adad1d03ce5c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
2014-11-21 01:37:51 +00:00
Jae Seo
7d97be9dbc am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev
* commit '91ab2665ed73a37ac9dda52e7d440784b1d1011e':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
2014-11-21 00:44:27 +00:00
RoboErik
bbf0f662a8 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev
* commit '3ef3a9bff37d2fbe216110e025f683923c58ddba':
  Handle volume events on master volume devices correctly
2014-11-21 00:43:39 +00:00
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
2014-11-21 00:43:33 +00:00
Lajos Molnar
a4fcb62a22 media: fix isSupportedFormat for integer frame rate
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
2014-11-20 16:17:43 -08:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
2014-11-20 23:00:56 +00:00
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
2014-11-20 12:53:23 -08:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
2014-11-20 11:47:40 -08:00
Jae Seo
f66f3052a7 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 2014-11-20 19:03:03 +00:00
Jae Seo
52bfa3328f Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 2014-11-20 18:52:16 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
RoboErik
b9c87fb403 Scale bitmaps in metadata sent to the system
This scales down any MediaMetadata bitmaps that are sent to the system
through MediaSession.

bug:18114918
bug:18084448
Change-Id: Ib7b040cd8245108ad2dd56afe2499290d2b49f51
2014-11-19 17:27:43 -08:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
2014-11-19 20:27:55 +09:00
Eric Laurent
0b03f9909b AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
Bug: 18271714.
Change-Id: I2fa6f44ef991aec5a980d70f698813468e7540c6
2014-11-18 18:08:02 -08:00
RoboErik
519c7744b5 Handle volume events on master volume devices correctly
We weren't passing volume events to the master volume correctly on
devices that only use a master volume. This fix checks if the device
only has a master volume and adjusts the master volume instead of the
stream's volume if that's the case.

bug:18305790
Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
2014-11-18 11:00:34 -08:00