6569 Commits

Author SHA1 Message Date
Adam Powell
4131a37366 String change for video routing via MediaRouter; "HDMI" not "HDMI audio."
Change-Id: Ifece0cf0bc11ff2ffab254c6177f9db741037df6
2012-09-28 12:52:34 -07:00
Adam Powell
705ab808cf Add wireless display selection support to MediaRouter.
* 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
2012-09-28 11:46:40 -07:00
Jeff Sharkey
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback.
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
2012-09-26 10:49:35 -07:00
Glenn Kasten
c6c4365ddb Implement android.media.AudioManager.getProperty()
Bug: 6635041
Change-Id: I0e7d53b99559cdc89f2f107f23048e4b1a8dd383
2012-09-25 17:01:40 -07:00
Eric Laurent
4bbcc65497 Display a fixed volume silder when docked.
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
2012-09-25 10:28:05 -07:00
Jean-Baptiste Queru
bf2e088b00 Merge into jb-mr1-dev
Change-Id: Iba23d16643b8754f6e0a7288b2ca242f722f1bdd
2012-09-25 09:42:57 -07:00
Eric Laurent
5bfaeaef3f pause music playback when switching user.
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
2012-09-21 18:44:48 -07:00
Eric Laurent
9903e2638a Volume keys control music volume after music stops
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
2012-09-21 18:21:24 -07:00
Eric Laurent
f1a457d06c Do not turn safe volume on upon headset connection
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
2012-09-21 09:22:26 -07:00
Glenn Kasten
d86077c379 Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-20 12:45:45 -07:00
Glenn Kasten
62796aac59 Expose android.media.AudioManager.getProperty()
Also fix minor documentation errors.

Bug: 6635041
Change-Id: I6bbbf1b7c5ab705ac374436ea0c098cb3c27fd4a
2012-09-20 12:28:20 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
Eric Laurent
bc0fab1fc2 Add multi user volume management
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
2012-09-19 14:16:08 -07:00
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -07:00
Mike Lockwood
954a5d61a2 Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 2012-09-18 17:12:37 -07:00
Mike Lockwood
db45484e4b AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
Bug: 7051259

Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-18 14:55:52 -07:00
Mike Lockwood
465d72073c am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
  MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 11:01:32 -07:00
Mike Lockwood
945080b5b6 am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 10:53:11 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Marco Nelissen
c5a6cdeb14 Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 2012-09-18 09:44:56 -07:00
Marco Nelissen
af68e7c5f5 Visualizer only works on sounds >5 sec.
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
2012-09-18 09:19:55 -07:00
Marco Nelissen
4dff2ab52b Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 2012-09-18 07:58:37 -07:00
Marco Nelissen
c7fb118d90 Activity.onStop(Bundle) does not exist
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
2012-09-17 17:03:30 -07:00
Glenn Kasten
228c9847a3 New API for querying audio properties
Bug: 6635041
Change-Id: I66e87c75af7c84cdb23cb25a958e79bba8e53baa
2012-09-17 08:54:11 -07:00
Eric Laurent
c34dcc1e1e headphone volume limitation
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
2012-09-16 17:44:45 -07:00
Ruei-sung Lin
51e67a0a74 Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev 2012-09-12 17:22:09 -07:00
Mike Lockwood
3ddaace1a2 Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 2012-09-12 16:31:56 -07:00
Mike Lockwood
f6f1661457 MtpDatabase: Use actual file size instead of media database size column
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>
2012-09-12 15:50:59 -07:00
Ruei-sung Lin
c733a79a43 Fix b/7087723 Patch leftover after tapping the red eye area
Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
2012-09-12 15:01:29 -07:00
Marco Nelissen
a962d749ed Merge "EffectsTest enhancements" into jb-mr1-dev 2012-09-12 10:25:53 -07:00
Marco Nelissen
80cd3fcd5c EffectsTest enhancements
Fix the session edit boxes, and make the effects list more readable
by translating known effect type UUIDs

Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
2012-09-11 13:47:16 -07:00
Mike Lockwood
25da9375fd Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev 2012-09-11 10:57:41 -07:00
Mike Lockwood
58e6831ccb MtpDatabase: Fix typo affecting parent and format queries
Bug: 7114350

Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-11 10:49:34 -07:00
Jean-Michel Trivi
2ac2afeac9 Add support for controlling remote submix audio routing
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
2012-09-10 12:29:09 -07:00
Jeff Brown
7017e48380 Merge "Add support for Wifi display." into jb-mr1-dev 2012-09-07 16:00:13 -07:00
Jeff Brown
cbad976b2a Add support for Wifi display.
Change-Id: I99693786cf9d07d07d3400046c55eb4933730b80
2012-09-07 13:26:31 -07:00
Eric Laurent
53082eced9 AudioSystem: new audio device enums
Update audio device enums to match new definitions in
native framework.

Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
2012-09-07 10:41:03 -07:00
Mike Dodd
37ee53420c Merge "Add context support to backdropper filter." into jb-mr1-dev 2012-09-07 08:43:36 -07:00
Mike Dodd
f330d19a17 Add context support to backdropper filter.
Part of b/7028438

Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
2012-09-06 17:00:38 -07:00
Marco Nelissen
2e2beaaee2 Audio Effects test app
Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f
2012-09-06 12:37:30 -07:00
Jean-Baptiste Queru
c67fb6c39e am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
2012-09-06 09:18:20 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
2012-09-06 09:12:17 -07:00
Jan Bjernler
20c38ea9fd Musicplayer application can not display DRM files of internal storage.
Make DRM-protected files transferred over MTP be detected.
Previously it was inserted into the database as MEDIA_TYPE_NONE,
the result of this was that the file was not detected properly.
With this fix the file is scanned from the beginning.

Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
2012-08-31 11:51:38 +02:00
Dianne Hackborn
73365695e4 Merge "Improve multi-user broadcasts." into jb-mr1-dev 2012-08-30 14:56:11 -07:00
Teng-Hui Zhu
4dc187b43a Merge "Fix a typo in the sample code" into jb-mr1-dev 2012-08-30 14:54:24 -07:00
Teng-Hui Zhu
a242deb1de Fix a typo in the sample code
Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
2012-08-30 14:36:58 -07:00
Dianne Hackborn
5ac72a2959 Improve multi-user broadcasts.
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.

Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.

New Context APIs for more kinds of sending broadcasts as users.

Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.

Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.

Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
2012-08-30 14:33:22 -07:00
Eric Laurent
794da7a054 AudioService: pause music when undocked
Send becomming noisy event also when disconnecting a dock
(analog, digital or USB) or HDMI.

Bug 6760590.

Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
2012-08-30 11:30:16 -07:00
Jeff Brown
dc7d8008ec Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 2012-08-27 17:16:53 -07:00