7236 Commits

Author SHA1 Message Date
Glenn Kasten
83db9ed199 Clean up imports
No need to import java.lang.*;
these imports are implicit in the language.

Change-Id: Ia903fb9546f2a295605dbc80ba69c4e6778627d6
2013-08-02 12:39:51 -07:00
Elliott Hughes
dcb1a58cf9 If media wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
2013-08-02 10:03:53 -07:00
Jean-Michel Trivi
68d6dedcc3 Remove whitespace in IAudioService.aidl
Change-Id: I537a2ad8356b04fec25bd7a5a8934f0bc343c1f6
2013-08-01 15:14:10 -07:00
Jean-Michel Trivi
3523a06375 Remove outdated comment in MediaFocusControl
The stream type is used in audio focus to better deal with
  RemoteControlClient/Display in the case of notifications
  during media playback. This comment is therefore outdated.

Change-Id: Ifa33bc4c0fbf065d8288ff5fdfaf1bc67b2a337e
2013-08-01 14:36:32 -07:00
Jean-Michel Trivi
9171db2798 Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Update android.media.AudioManager.requestAudioFocus() javadoc for the
  new focus type.

Bug 8251963

Change-Id: I7cd69faaf5f0169ee462b91d0aaa75dc6b092107
2013-08-01 09:19:58 -07:00
Jean-Michel Trivi
2380566deb Notification muting conditional to exclusive audio focus request
Summary of feature:
Do not mute notifications when speech recognition recording is
  active, but when an app has requested audio focus with
  AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE.

Implementation:
Move definition of AUDIOFOCUS_NONE to AudioManager where other
  audio focus codes are defined.
Add support for querying the current audio focus type.
When audio focus is requested as GAIN_TRANSIENT_EXCLUSIVE, make
  the corresponding loss by LOSS_TRANSIENT.
Before playing a notification, check whether GAIN_TRANSIENT_EXCLUSIVE
  has been requested.

Bug 8251963

Change-Id: I41edc77326b70639d2fdcb4642c53109995b72a8
2013-07-31 14:37:19 -07:00
jangwon.lee
3ed02535fd When deleting a db file,
Context.deleteDatabase() has to be called instead of File.delete()
to guarantee all db related files
like journal, wal, shm, etc are deleted together.

Signed-off-by: jangwon.lee<jangwon.lee@lge.com>

Change-Id: I3c3d7dfa13ffbe709ab7d8a5c7cfe6cfa2864fea
2013-07-31 07:18:25 +00:00
Jean-Michel Trivi
cbb212ff6f Focus gain sends focus loss through the focus stack
When a new focus owner lands on the stack, don't just make the
 previous top of the stack lose focus, propagate the loss throughout
 the stack.
Only dispatch focus loss on focus loss state change
Remove canDispatchFocus() method as it now doesn't need to be known
 (and shouldn't be known) outside of the implementation.
Fix error where the focus code for a focus gain request should
 always be a focus loss code.

Bug 8315302

Change-Id: I92c8f51fdcc090851d34d00fefed916e25da40c1
2013-07-30 17:13:00 -07:00
Jean-Michel Trivi
53e6e287ff Focus loss value takes into account previous loss
Implement a state machine to represent how to transition to the
 next audio focus loss state, given the current focus loss (state)
 and the given external focus gain (transition).

Bug 8315302

Change-Id: I4a3d5a4a53c842caceaa876206a993c4e5446681
2013-07-30 14:21:34 -07:00
Jean-Michel Trivi
fec4a907b1 Merge "Audio focus request managed by FocusRequester class" 2013-07-30 18:54:48 +00:00
Eino-Ville Talvala
92ed645159 Merge "Camera2 API: Rename package to android.hardware.camera2" 2013-07-30 18:42:20 +00:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Jean-Michel Trivi
783cea4658 Merge "More refactor of audio focus, keep track of focus loss" 2013-07-30 18:31:13 +00:00
Jean-Michel Trivi
83283f23eb Audio focus request managed by FocusRequester class
Move all audio focus request functionality under a new class/file.
Clean up encapsulation of data related to the request.

Change-Id: I989796e1ee1a5fc99799a64e1612294e0e40fa6d
2013-07-30 11:27:08 -07:00
Marco Nelissen
4d4a137bf5 am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
  MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
2013-07-30 10:28:38 -07:00
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Jean-Michel Trivi
00bf4b1817 More refactor of audio focus, keep track of focus loss
Move more audio focus-specific functionality into the class
  representing each audio focus owner, FocusStackEntry.
Keep track of how each FocusStackEntry instance lost focus.

Change-Id: I35df0717765a26ec747cb0110e2e951d155d1525
2013-07-29 18:15:29 -07:00
Jean-Baptiste Queru
0350f4167f am 00157c0d: am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
* commit '00157c0d466786e7f125f58257ff706e132c52ef':
  MediaFormat: Fix the documentation link to the AAC profile constants
2013-07-29 16:40:21 -07:00
Jean-Baptiste Queru
6c0fe0df4e Merge "MediaFormat: Fix the documentation link to the AAC profile constants" 2013-07-29 23:03:00 +00:00
Chong Zhang
d7c05c2ca9 Merge "Select BT route when currently selected route becomes unavailable" 2013-07-26 23:46:46 +00:00
Chong Zhang
2e5fbf5521 Select BT route when currently selected route becomes unavailable
Bug: 10003524
Change-Id: I5de740fac9f2bc2a56125296defe892a8deb505e
2013-07-26 15:36:37 -07:00
Marco Nelissen
3f44fae1dd am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"
* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever
2013-07-26 14:55:00 -07:00
Oscar Rydhé
425916e4c5 Fix NullpointerException in MediaMetadataRetriever
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.

Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
2013-07-26 18:18:17 +00:00
Martin Storsjo
816af56eac MediaFormat: Fix the documentation link to the AAC profile constants
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
2013-07-25 12:53:46 +03:00
Martin Storsjo
158754b1bf MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
If reading the decoded pixel data (instead of letting the system
render it), this is critical for interpreting the data correctly.

The video MediaCodec CTS tests use this MediaFormat key in this
way as well.

Therefore, make sure the documentation reflects the actual use of
this field - claiming that it is encoder-only is misleading.

Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
2013-07-25 10:52:54 +03:00
Jean-Michel Trivi
2e01220647 Merge "More info in audio focus stack entry" 2013-07-24 22:35:30 +00:00
Glenn Kasten
1bd84bd3d5 Merge "Rename mChannels to mChannelMask to avoid ambiguity" 2013-07-24 22:35:11 +00:00
Glenn Kasten
44097837df Merge "Match AudioRecord.getChannelConfiguration docs" 2013-07-24 22:30:20 +00:00
Jean-Michel Trivi
caa2c5bba8 More info in audio focus stack entry
Add fields in an audio focus stack entry to track what type of audio
 focus was requested, and why it was lost.
Make audio focus dump easier to read.

Change-Id: I61f6e43c13a32328a07125a2ba0dce1053872c86
2013-07-24 14:52:57 -07:00
Glenn Kasten
33c437df39 Rename mChannels to mChannelMask to avoid ambiguity
This clarifies that it's a channel mask, as opposed to a count.

Also no need to initialize the field in the declaration,
as it's initialized in the constructor.

Include channel mask in error logs.

Change-Id: Ifc02668cf922dc8826a9fb042b3ca52fad377ba6
2013-07-24 12:20:52 -07:00
Glenn Kasten
d5af238199 Match AudioRecord.getChannelConfiguration docs
Bug: 10001767
Change-Id: I28705ae84ee585afc37cdd2b13a039b7bfc36543
2013-07-24 11:43:32 -07:00
Zhijun He
7f4d3147d1 camera2: Implement CameraDevice#waitUntilIdle
Also cleanup some logging/comments.

Change-Id: Id1a4dd853519802a2b74b8d2172095ba388329e6
2013-07-23 13:46:37 -07:00
Zhijun He
a874c6762d Merge "MediaFrameworkTest: Fix camera unit test failure" 2013-07-23 17:33:51 +00:00
Glenn Kasten
369dbf9a66 Merge "Use the utility logging methods and single tag" 2013-07-23 16:26:01 +00:00
Jean-Michel Trivi
2352228ff1 Merge "Launch voice-based searches as current user" 2013-07-23 16:20:26 +00:00
Jean-Michel Trivi
9020316ea3 Merge "Fix dump formatting of RemoteControlClient playback state dump" 2013-07-23 16:18:58 +00:00
Glenn Kasten
4afca0cc90 Merge "Detect integer overflow" 2013-07-23 15:52:31 +00:00
Glenn Kasten
4e693f558f Merge "Verify that AudioRecord object is initialized for more APIs" 2013-07-23 15:22:39 +00:00
Glenn Kasten
7fc7230787 Merge "Remove redundant AudioRecord. qualifiers" 2013-07-23 15:03:14 +00:00
Glenn Kasten
004f2b7835 Merge "Return the record state locked" 2013-07-23 14:51:30 +00:00
Zhijun He
229019e6af MediaFrameworkTest: Fix camera unit test failure
Fix for testSubmitStreamingRequest failure

Change-Id: I2e22a56b3da90112a668c2185b05eb9288cde392
2013-07-22 18:08:30 -07:00
Jean-Michel Trivi
f47634edfe Fix dump formatting of RemoteControlClient playback state dump
Take into account the two types of undefined plyback position.
Only use "ms" unit when there is a position to write.
Fix misplaced ",".

Change-Id: I5033ec6ee7480f1ac525af7b7b0a9da259614783
2013-07-22 17:47:11 -07:00
Jean-Michel Trivi
dcd40c0e57 Launch voice-based searches as current user
Launch the voice-based interactions (voice search, web search) as
 the current user.

Change-Id: I5a038feea24346c3c94f86097f574ffdc499cf60
2013-07-22 16:46:42 -07:00
Jean-Michel Trivi
fa9a69805b Refactor for audio focus, remote control, media button handling
Extract audio focus, remote control and media button handling
 outside of AudioService without any changes in functionality.
 Moving logic to new class, MediaFocusControl.
Introduce interface for managing volum control logic, VolumeController.
 The VolumePanel class implements this interface.

Change-Id: I72bda2e0670c26e61ff076fd729c15f9f1156dc5
2013-07-22 16:09:15 -07:00
Igor Murashkin
6944165014 Merge "camera2 api: marshal rect, size, string for metadata" 2013-07-22 21:38:55 +00:00
Glenn Kasten
626c0415a2 Use the utility logging methods and single tag
See Change-Id: I5bfc66562a4a0630d520390ae886bd19de3327cb

Change-Id: I569e0a746c4430f9d0cd1cb20bbc9aa50b81bcfc
2013-07-22 10:07:03 -07:00
Glenn Kasten
6ab188589d Detect integer overflow
See Change-Id: Iec36fc0ea67095e18a2c238b148dad5545c102c1

Change-Id: I421f0d84c64310fcb6c5451993cfaf38125c4bb2
2013-07-22 10:01:16 -07:00
Glenn Kasten
70c17f4703 Merge "Inform AudioFlinger of device's low RAM attribute" 2013-07-22 15:02:29 +00:00
Glenn Kasten
8057f24d4a Verify that AudioRecord object is initialized for more APIs
Compare to AudioTrack, which already has these checks.

Change-Id: I3a239dfb4b918ceabfb723f189cc50ed6662eee6
2013-07-22 07:40:41 -07:00
Glenn Kasten
25a64b4bad Remove redundant AudioRecord. qualifiers
Symbols of the current class don't need to be qualified.
See Change-Id: Ic89ce568771165d01d4b5bcf835c591ca0b86541

Change-Id: I75ec74a95cf68bf8eabdbac5b227a9035b945360
2013-07-22 07:40:23 -07:00