4183 Commits

Author SHA1 Message Date
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
2015-08-11 15:04:56 -07:00
Paul McLean
1135457a3d Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
Bug: 22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
2015-08-07 14:45:24 -06:00
Paul Mclean
5fa8939d6f Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
2015-08-07 12:57:55 -06:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Wei Jia
5d177fff2f MediaSync: fix API comments.
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
2015-08-06 12:51:36 -07:00
Paul Mclean
af7748efb6 Merge "Consider channel index masks when calculating channel counts." into mnc-dev 2015-08-06 18:59:06 +00:00
Paul Mclean
c770b7a537 Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 2015-08-06 18:58:33 +00:00
Paul McLean
8b2562b14c Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
2015-08-06 10:03:13 -06:00
Paul Mclean
8eaf18b0ab Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 2015-08-05 20:50:29 +00:00
Paul McLean
22cfec3cb8 Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.

Bug: 22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
2015-08-05 14:06:28 -06:00
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +00:00
Paul McLean
3115960bde Consider channel index masks when calculating channel counts.
Bug: 22874806
Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
2015-08-05 09:03:51 -06:00
Phil Burk
a95faf78bf MidiManager: use ConcurrentHashMap
So that adding and removing device listeners is thread-safe.

Bug: 22909752
Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197
Signed-off-by: Phil Burk <philburk@google.com>
2015-08-04 15:38:55 -07:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Jean-Michel Trivi
6d00e41145 AudioService: check for audio device connection success
When connecting/disconnecting and audio device, AudioService
  was assuming that the call was always successful through
  AudioSystem.setDeviceConnectionState(). In the case of the
  connection of a wired headset (mic + headphones), this also
  causes A2DP to not be used for media playback.
The connection can fail if the audio device being connected
  is not supported by the platform. But if this failure is
  not taken into account for DEVICE_OUT_WIRED_HEADSET or
  HEADPHONES, A2DP would still be avoided even when an A2DP
  device reconnects at boot.
The fix consists in executing the connection logic only when
  the connection was deemed successful. Nothing is altered
  on the disconnection code path, or the direct connection
  of A2DP.
The javadoc is updated in AudioSystem to indicate the return
  codes to take into account in setDeviceConnectionState().

Bug 22511833

Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
2015-08-03 17:26:01 -07:00
Jeff Sharkey
3ba2bfa7b2 Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 2015-08-03 20:54:32 +00:00
Jeff Sharkey
449e5fd5f8 Expand ringtone titles to support OGG and FLAC.
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.

Bug: 22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
2015-08-03 13:51:13 -07:00
Lajos Molnar
afa6ceb5a0 media: Clarify MediaCodec and CodecCapabilities documentation
Bug: 21932760
Bug: 22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
2015-07-31 14:48:47 -07:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Ronghua Wu
e8b7febd62 Merge "media: use blocks number to find closest size" into mnc-dev 2015-07-31 02:32:53 +00:00
Phil Burk
2f1a08e601 Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 2015-07-30 21:27:47 +00:00
Phil Burk
fdcd82164f Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 2015-07-30 21:27:25 +00:00
Phil Burk
559a2420d3 Merge "MidiDevice: document that opens can return nulls" into mnc-dev 2015-07-30 21:26:48 +00:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
2015-07-30 13:01:20 -07:00
Glenn Kasten
00908b6c69 Improve getTimestamp documentation
Bug: 18977548
Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
2015-07-30 10:07:34 -07:00
Phil Burk
3cc1bdbc6e MIDI docs BTLE: how to open BTLE MIDI devices
Adds crucial information including required permissions,
MIDI UUID, and call to openBluetoothDevice().

Bug: 22606182
Change-Id: I47393bd0ecc2601906f6e50075d694c9cc17c993
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-29 16:47:12 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Phil Burk
44d535aaf2 MIDI package doc: add hasSystemFeature() call
Bug: 22800792
Change-Id: Ib4b3e16e8167191505c31522bbccd521a9807528
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-29 14:00:09 -07:00
Phil Burk
645a0b2bfe MidiDevice: document that opens can return nulls
Bug: 22800792
Change-Id: I8d7ca1976e9a8abbabc011d3b2391ad7fe646f83
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-29 13:39:01 -07:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
2015-07-28 15:08:08 -07:00
Jean-Michel Trivi
cab361c9bb MediaPlayer subtitle controller: use debug log instead of warning
Don't use warning log for debug message.

Bug 22698299

Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
2015-07-23 23:03:45 +00:00
Jean-Michel Trivi
13ceb54a19 RingtoneManager: query results depend on caller permission
When querying for ringtones, only look for ringtones on external
  storage when the caller has READ_EXTERNAL_STORAGE.
Document this behavior in the javadoc of the affected methods.

Bug 22545684

Change-Id: Iae9c9a4ccaf635da8af2ac289b6b4df1b16c5d11
2015-07-22 15:48:06 -07:00
Jae Seo
345af96677 TIF: Enable hardware acceleration on overlay
Bug: 18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
2015-07-22 12:34:17 -07:00
Todd Kennedy
f2805bcbe1 Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 2015-07-21 18:11:19 +00:00
Todd Kennedy
68de157b78 Use RingtonePlayer to get ringtone title
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.

Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
2015-07-20 17:24:15 -07:00
Terry Heo
e95af4ab8b Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 2015-07-20 23:57:31 +00:00
Jeff Sharkey
4fa85b7cad Better logging of MediaPlayer failure reason.
Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
2015-07-20 09:38:02 -07:00
Terry Heo
5a3ef42422 TIF: Use copied track list for onTracksChanged() callback
In notifyTracksChanged(), the calling onTracksChanged() could be delayed.
To prevent race condition on tracks, we should use the copy of tracks.

Bug: 22436933
Change-Id: I0c595df9d06d5f7bda4a9f8c21a661f7aa7db71f
2015-07-20 01:29:44 +00:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Jae Seo
2ac1fd3c9d TIF: Avoid generating locale dependent input IDs
Bug: 22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
2015-07-16 17:48:55 -07:00
Lajos Molnar
d08debcf42 MediaSync: fix flush handling and deadlock
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
2015-07-16 17:09:20 -07:00
Eric Laurent
bd874b8be7 Merge "AudioManager: fix audio device callback list access" into mnc-dev 2015-07-15 01:31:47 +00:00
Eric Laurent
1691f73de5 AudioManager: fix audio device callback list access
Bug: 22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
2015-07-14 16:27:54 -07:00
Ronghua Wu
148c7c5c17 Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 2015-07-14 15:21:34 +00:00
Kenny Guy
7d170797ac Merge "Mute correct user from device policy manager." into mnc-dev 2015-07-09 10:06:25 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Kenny Guy
70e0c58c22 Mute correct user from device policy manager.
Add per user versions of mute methods so
device policy manager can mute the correct
user.
Just persist change if the calling user
isn't the current user.
Treat calls to audio manager coming from uid
1000 as if they were coming from current user
rather than user 0 so that the correct user's
user restriction is checked.

Bug: 21782066
Bug: 21778905
Change-Id: I51469b741096d8a2ffdc520eaf5b3fd754f2c819
2015-07-08 19:33:13 +01:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs.
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
2015-07-07 17:46:16 -07:00