1761 Commits

Author SHA1 Message Date
Glenn Kasten
1f61d01508 Use the utility logging methods and single tag
Change-Id: I5bfc66562a4a0630d520390ae886bd19de3327cb
2012-11-29 15:24:11 -08:00
Jean-Michel Trivi
0572954507 am 015ec39d: am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev
* commit '015ec39dffe54687781357f9ef751b6218159c5d':
  Fix audio focus evaluation order for display update
2012-11-20 18:07:10 -08:00
Jean-Michel Trivi
015ec39dff am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev
* commit '5985d106f784388f979f86598408cb7c8615ebee':
  Fix audio focus evaluation order for display update
2012-11-20 18:05:09 -08:00
Jean-Michel Trivi
4dd3fb3e2c Fix audio focus evaluation order for display update
Change 1f9196a8e5de9b004e61afabc70b18caf7cf9c7e introduced
 an issue when trying to ignore audio focus entries in the
 stack that don't use the music stream, or are for transient
 audio focus gain, for remote control display updates.
The bug was that the audio focus stack traversal was not
 starting from the top, as it should. It was using
 the iterator order, which, in the case of a stack, starts
 with the bottom-most entry.
The fix consists in traversing the stack from the top, i.e.
 from the last element of the vector used to hold the stack
 entries.

Bug 7311023

Change-Id: I0c1900dbf98599a621a420ab55531a3eee838fe5
2012-11-20 17:59:34 -08:00
Marco Nelissen
68cc52cf67 am 803db164: am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played."
* commit '803db1646aedb451b76d33a4f30b16942c5d3ca4':
  Fallback to fallbackring if ringtone can't be played.
2012-11-16 13:07:04 -08:00
Marco Nelissen
803db1646a am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played."
* commit 'aeb6268645d571dfc9f2d387a7ad2471039ddb54':
  Fallback to fallbackring if ringtone can't be played.
2012-11-16 13:03:33 -08:00
Oscar Rydhé
1c25a21ffc Fallback to fallbackring if ringtone can't be played.
If the specified ringtone file exists but cannot be played
the Ringtone will try to play the ringtone in a remote player.
But since the file is corrupt it will not be played in the
remote player either.
According to the documentation it should attempt to
fallback on another sound. This commit will do that.

Change-Id: I0216d61ca874eef0f168ad4d5bfb07491e01e654
2012-11-16 14:22:14 +01:00
Andreas Huber
f7f2357338 am 35de4831: am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
* commit '35de48317f51a1331e2c6f279c5a2e76b65469ad':
  Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
2012-11-14 10:45:56 -08:00
Andreas Huber
35de48317f am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
* commit 'd1e8f467602307090f36a899b47f5088d0bc0201':
  Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
2012-11-14 10:24:24 -08:00
Andreas Huber
99a86d0633 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content
and cannot be used to configure the _encoder_ to emit ADTS content.

Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug: 7542186
2012-11-14 09:16:59 -08:00
Craig Mautner
0f32fdc3db am 50acd731: am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
* commit '50acd73173e5ca68db0a4cc01e75a2faef86b2fb':
  Support Wifi display devices that rename themselves.
2012-11-13 10:07:29 -08:00
Craig Mautner
50acd73173 am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
  Support Wifi display devices that rename themselves.
2012-11-13 10:04:27 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Glenn Kasten
068225de01 Add all-channel setVolume() API
Add combined channel APIs setVolume to AudioTrack, MediaPlayer, and
SoundPool to make later migration easier, and encourage apps to use
that API.  The new APIs are @hide for now.

Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
2012-11-08 17:50:43 -08:00
Eric Laurent
91d5cc56d3 am 2b988843: am 30717b68: Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev
* commit '2b9888439d4016ac4890b0c6018d2f5a9e5bd653':
  AudioService: undock audio glitch - DO NOT MERGE
2012-11-08 15:45:27 -08:00
Eric Laurent
8a8e2a4b9c am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev
* commit '98e5c81438f36d907215eeba338ee834c29791de':
  audio service fix dock after crash - DO NOT MERGE
2012-11-08 15:45:23 -08:00
Eric Laurent
0214f2b856 AudioService: undock audio glitch - DO NOT MERGE
merge from master:

"AudioService: improve low end dock audio control

Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.

Bug 7463620."

Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
2012-11-08 09:17:56 -08:00
Eric Laurent
cd3231f501 audio service fix dock after crash - DO NOT MERGE
merge from master:
"audio service: set dock use on mediaserver restart

Restore forced usage of dock audio for media according to
current setting when media server restarts."

Bug 7485250.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
2012-11-08 09:05:22 -08:00
Jeff Brown
74da109102 Support Wifi display devices that rename themselves.
Some Wifi display devices like to rename themselves after a
connection completes (or at other times).  Make sure to update
the name of the display when we detect that it changed in
our scan results.

This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.

Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.

Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
2012-11-07 18:43:32 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Eric Laurent
be78e991fd Merge "AudioService: improve low end dock audio control" 2012-11-06 08:37:55 -08:00
Eric Laurent
08ed1b9d20 AudioService: improve low end dock audio control
Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.

Bug 7463620.

Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
2012-11-05 16:04:58 -08:00
Marco Nelissen
da005f4600 am ff25dd33: am 6791ebde: am 7a4d856c: Merge "Removed offensive music genre"
* commit 'ff25dd337d1f7a079495c0c5f5bb69fd1f97548f':
  Removed offensive music genre
2012-11-05 15:47:32 -08:00
Marco Nelissen
6791ebde5f am 7a4d856c: Merge "Removed offensive music genre"
* commit '7a4d856c881ef48ad590d9e5a0456c94d188898a':
  Removed offensive music genre
2012-11-05 15:41:31 -08:00
Marco Nelissen
7a4d856c88 Merge "Removed offensive music genre" 2012-11-05 14:50:09 -08:00
Marco Nelissen
6b37dc9f66 Merge "Request non-notifying Cursor when querying provider" 2012-11-03 13:42:33 -07:00
Eric Laurent
bff5ca576e audio service: set dock use on mediaserver restart
Restore forced usage of dock audio for media according to
current setting when media server restarts.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
2012-11-02 16:48:26 -07:00
Marco Nelissen
8ad76fa7a6 Request non-notifying Cursor when querying provider
This makes a media-rescan about twice as fast.
b/6751354

Change-Id: Iac3b0238f5731a20ecb5d4b34aa1666f7c610268
2012-11-02 16:40:37 -07:00
Marco Nelissen
dd1caa0050 Merge "Remove special case in media scanner" 2012-11-01 16:20:24 -07:00
Marco Nelissen
da8fe0faf5 Remove special case in media scanner
The media provider now takes care of case-sensitivity, so there is
no special handling needed when looking up entries in the database.

Change-Id: I2a23c4f1875a8ffea140281572b1e2c90cce60a7
2012-11-01 16:04:32 -07:00
Eric Laurent
2c978a1ce9 am 88ae0ae4: am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
* commit '88ae0ae4848ce894612397957cf4de6a6a50a394':
  audio service: make dock audio is off by default
2012-10-30 10:11:01 -07:00
Jean-Michel Trivi
a6daf109b6 am 15f7136e: am 0c419856: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev
* commit '15f7136e9b0b4ce1e512be7863b2e61e47d855f3':
  No playback and music widget from other user on user switch
2012-10-30 10:10:57 -07:00
Eric Laurent
9c95a173f7 am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev
* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
  add settings for dock audio enabled
2012-10-29 17:14:59 -07:00
Eric Laurent
61ebf9cd8f Merge "audio service: make dock audio is off by default" into jb-mr1-dev 2012-10-29 15:21:33 -07:00
Jeff Brown
266ca72300 am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
  Add MediaRouter API to get presentation display.
2012-10-29 13:43:14 -07:00
Jean-Michel Trivi
f4a8eb2211 No playback and music widget from other user on user switch
On user switch:
 - make the current audio focus owner loose audio focus
 - clear the remote control display

Bug 7205290
Bug 7307156

Change-Id: I6ebcb94d1d2bae8c57ab98dd7e795b239a981d28
2012-10-29 12:42:55 -07:00
Eric Laurent
5ba0ffa023 audio service: make dock audio is off by default
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
2012-10-29 12:31:09 -07:00
Eric Laurent
c99a1107c0 Merge "add settings for dock audio enabled" into jb-mr1-dev 2012-10-27 14:42:18 -07:00
Eric Laurent
7ee1e4ff73 add settings for dock audio enabled
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
2012-10-26 18:11:21 -07:00
Marco Nelissen
348aa65e93 Don't create files when scanning
MediaScanner would insert non-existent files into the database
if you asked it nicely, thereby creating them.
b/7298303

Change-Id: Ie8496072248f2041e5a73cc04083e2a31c78f046
2012-10-26 16:29:59 -07:00
Jeff Brown
92130f6407 Add MediaRouter API to get presentation display.
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
2012-10-25 20:31:21 -07:00
Bryan Mawhinney
33c0a616db Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 2012-10-25 02:06:37 -07:00
Bryan Mawhinney
2bb7c122ef Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
Change-Id: Id8fa45aefde85e2ba2b57694b91485ef25e2e5f2
2012-10-24 13:59:33 +01:00
Eric Laurent
d799db406b AudioService: add fix for corrupted settings
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
2012-10-23 20:14:27 -07:00
Jeff Sharkey
8d9a1f66d9 More migration to Global settings.
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
2012-10-18 15:38:14 -07:00
Jean-Michel Trivi
256ab9e9b9 Merge "Use device availability to start WFD audio routing" into jb-mr1-dev 2012-10-15 16:24:56 -07:00
Marco Nelissen
39ca39b026 Rewind buffer before copying into it.
b/7334897

Change-Id: I83f795cb662d0845314bfb80b9a27ae45b2a0517
2012-10-12 11:13:10 -07:00
Jean-Michel Trivi
c203ecfd9f Use device availability to start WFD audio routing
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
2012-10-11 18:30:11 -07:00