drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,405 Commits 1 Branch 0 Tags
Commit Graph

9913 Commits

Author SHA1 Message Date
Jean-Michel Trivi
42697ffd42 Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags 
Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
  AudioAttributes flags that will be used when playing the
  Ringtone.

Bug 19407114

Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221
 2015-05-20 19:14:45 -07:00
Chet Haase
fa2dafa741 Fix docs to not refer to non-public classes. 
Issue #21328285 public Midi docs refer to internal utility class

Change-Id: Idddd5c98a78159190c6c34b17350f4630c33d6d5
 2015-05-20 18:20:08 -07:00
Eric Laurent
0867bed9dd AudioService: indicate system ready to AudioFlinger 
Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.

Bug: 11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
 2015-05-20 17:39:21 -07:00
Andy Hung
b14b7e188f Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev 2015-05-20 23:01:39 +00:00
Andy Hung
e90a0a88f4 Fix AudioTrack, AudioRecord, AudioFormat API 
Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
 2015-05-20 22:58:31 +00:00
Jean-Michel Trivi
d3969546a8 Fix reading attributes for playback restrictions 
Playback restrictions can be lifted with the correct flag,
  FLAG_BYPASS_INTERRUPTION_POLICY, but this flag is for the
  system only. As such, it must be read by querying "all
  the flags" with AudioAttributes.getAllFlags() which is a
  system API which returns all the system flags. getFlags()
  only returns the public SDK flags.

Bug 19407114

Change-Id: I22dadfaf5d1b48b3c0754e1e6af00b734d790fec
 2015-05-20 13:58:18 -07:00
Eric Laurent
5aa384cdc8 Merge "AudioFormat: more compressed formats" into mnc-dev 2015-05-20 16:22:01 +00:00
Paul McLean
aa1cd25db7 Merge "Updating (and completing) documentation post API-council changes." into mnc-dev 2015-05-20 15:56:08 +00:00
Paul McLean
8e6c9f4617 Updating (and completing) documentation post API-council changes. 
1. Enum/Select/Notify API
2. (re)routing API

bug: 21151568
Change-Id: Idce969c8b8955022b7810cf5dddb800e6aa01000
 2015-05-20 07:48:12 -07:00
Dongwon Kang
cf4f3d5c4c TIF: Fix an incorrect conversion in timeShiftSetPlaybackParams() 
Bug: 21313401
Change-Id: I73e55c454cf0e2cd90d922acf5c6efe727f59204
 2015-05-20 13:57:34 +09:00
Eric Laurent
cae3466333 AudioFormat: more compressed formats 
Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.

Bug: 18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
 2015-05-19 16:46:52 -07:00
Jean-Michel Trivi
1705113e91 Merge "API for converting AudioAttributes to stream type" into mnc-dev 2015-05-19 23:42:34 +00:00
Jean-Michel Trivi
d1d5a0a080 API for converting AudioAttributes to stream type 
Bug 21267880

Change-Id: I3389dcb3a35a3786ecdb8f56a917a0ae619e8417
 2015-05-19 16:35:25 -07:00
Glenn Kasten
b0e172304c Merge "Explain the void send() throws IOException" into mnc-dev 2015-05-19 17:34:22 +00:00
Glenn Kasten
5db6637f8c Explain the void send() throws IOException 
Bug: 21044677
Change-Id: If6b51058813aff3780821db7c619004622df64ca
 2015-05-19 08:46:48 -07:00
Glenn Kasten
c4ddf16c8b Merge "send without timestamp is not equivalent to send now" into mnc-dev 2015-05-19 15:38:01 +00:00
Glenn Kasten
a32d5c8472 send without timestamp is not equivalent to send now 
Change-Id: I68decbd005932c762ccd376ee80b52ac9884fba4
 2015-05-19 08:33:36 -07:00
Glenn Kasten
0e2c164a8a Merge "Update documentation for short transfer counts" into mnc-dev 2015-05-19 00:28:20 +00:00
Glenn Kasten
659e31fb29 Update documentation for short transfer counts 
Bug: 10891562
Change-Id: I6e24917a508aa29f1f6f00aa8c891ad4978dc3e6
 2015-05-18 14:11:26 -07:00
Glenn Kasten
14d226a2cd Add comments to indicate code review was done for bugs 
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
 2015-05-18 13:54:40 -07:00
Glenn Kasten
20a0edf123 Merge "Minor cleanup of comments and code" into mnc-dev 2015-05-18 20:38:32 +00:00
Jae Seo
f03fb7f3a4 Merge "TIF: Pass the playback params as a whole" into mnc-dev 2015-05-18 18:10:31 +00:00
Jae Seo
194118f913 Merge "Make PlaybackParams parcelable" into mnc-dev 2015-05-18 18:05:34 +00:00
Jae Seo
76c4fc2977 Make PlaybackParams parcelable 
Bug: 21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
 2015-05-18 17:54:47 +00:00
Lajos Molnar
c8304e86c8 Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev 2015-05-18 17:32:17 +00:00
Robert Shih
40bdcb7c52 Merge "MediaPlayer: persistent track indices" into mnc-dev 2015-05-18 15:56:31 +00:00
Jae Seo
4b34cc7763 TIF: Pass the playback params as a whole 
Bug: 21172914
Change-Id: I2d89f267d8d83b14b5d436304aa0ff82490211d8
 2015-05-16 15:01:53 -07:00
Andy Hung
921ded795f Merge "Fix SoundPool.unload() return value" into mnc-dev 2015-05-16 04:11:09 +00:00
Glenn Kasten
6e745aecf9 Merge "Rename mChannels to mChannelMask" into mnc-dev 2015-05-16 02:11:56 +00:00
Andy Hung
a6238ef389 Fix SoundPool.unload() return value 
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
 2015-05-15 18:43:03 -07:00
Lajos Molnar
c9020aff3a media: clarify valid values in PlaybackParams and SyncParams 
Bug: 21134712
Change-Id: I42182733013d70e11d8c59bf4f5daa7eeb374597
 2015-05-15 18:33:28 -07:00
Robert Shih
a460ea1a2c MediaPlayer: persistent track indices 
Maintain inband (from native extractor) and out-of-band tracks (added by
client) in a single append only vector. This ensures that the same track
corresponds to the same index through out playback.

Bug: 10373268
Change-Id: I87b3ca2d2c710ee9087f7686f82ab0e018f55fd0
 2015-05-15 17:04:32 -07:00
Robert Shih
1973189fe0 MediaPlayer: clean up subtitle controller log spam 
- create a default SubtitleController if not set explicitly
- log warning instead of error

Bug: 17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a
 2015-05-15 17:03:46 -07:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Paul McLean
0c72f4f9d0 Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev 2015-05-15 14:35:50 +00:00
Jae Seo
ed6586a569 TIF: Remove incorrect audio mode check 
Bug: 21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60
 2015-05-14 19:16:30 -07:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review 
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
 2015-05-15 01:44:59 +00:00
Paul McLean
f62c7428e7 Change AudioDevicesInfo.getFormats() to getEncodings(). 
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
 2015-05-14 14:57:08 -07:00
Zhijun He
758e6a8f70 Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev 2015-05-14 21:46:38 +00:00
Zhijun He
492afe9014 Merge "Image/Reader/Writer: address API review comments" into mnc-dev 2015-05-14 21:44:01 +00:00
Zhijun He
d99dc329b9 Image/Reader/Writer: address API review comments 
* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils

Bug: 21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c
 2015-05-14 14:35:57 -07:00
Chong Zhang
7fc802bbf7 Merge "MediaDataSource: address API council comments" into mnc-dev 2015-05-14 21:29:52 +00:00
Chong Zhang
bc10185fa1 MediaDataSource: address API council comments 
- throw IOExecption on fatal errors

- add offset argument to readAt

- and fix a crash in MediaExtractor

bug: 21045118
bug: 21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
 2015-05-14 14:19:01 -07:00
Lajos Molnar
51bf5d9c07 Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev 2015-05-14 21:17:31 +00:00
Lajos Molnar
05a822161f media: change final fields to accessors in MediaTimestamp 
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
 2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8 media: remove setPlaybackRate from MediaPlayer and MediSync 
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.

Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
 2015-05-14 12:16:44 -07:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Jean-Michel Trivi
f578953ead Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev 2015-05-14 03:21:55 +00:00
Jean-Michel Trivi
6c307879b7 AudioTrack in SoundPool uses audio_attributes_t parameter 
Bug 20731155

Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
 2015-05-13 19:26:12 -07:00
Andy Hung
2bdd69c4a2 Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev 2015-05-14 02:18:02 +00:00