8527 Commits

Author SHA1 Message Date
RoboErik
16404773d7 am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '504752fb3833a90f4a226a2027939cb972cb8a9b':
  Ensure MediaBrowser state is set to connecting after a reconnect
2014-09-25 18:46:13 +00:00
RoboErik
96900279f5 am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
  Allow null queues to be set in MediaSession
2014-09-25 18:46:09 +00:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
Ronghua Wu
ac1e24986c am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit 'ca7f391e2b04a9efc4beb5f5b769653a983ff424':
  MediaCodecList: fix findEncoderForFormat.
2014-09-25 00:27:44 +00:00
Lajos Molnar
22da05cb23 am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
* commit '4e43a27a9884e24ba47599597091176b772ddb24':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
2014-09-25 00:27:36 +00:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00
Ronghua Wu
e19a80def2 MediaCodecList: fix findEncoderForFormat.
Bug: 17460057
Bug: 17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
2014-09-25 00:17:15 +00:00
Lajos Molnar
752c0e95d6 am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit 'aa1f0856a144f2f2ba14c6358d633887e7e8b936':
  MediaCodec: revalidate cached queued input buffers if queue fails
2014-09-24 23:47:31 +00:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2)
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
2014-09-24 16:44:47 -07:00
Lajos Molnar
7e28fc7370 Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 2014-09-24 23:40:56 +00:00
Ruben Brunk
bc167acc25 am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
  camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-24 23:01:08 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
RoboErik
88b84178d6 Ensure MediaBrowser state is set to connecting after a reconnect
When the binder had disconnected we were setting the state to suspended
and then not setting it back to connecting when we reconnected. This sets
the state correctly when we are trying to connect again.

bug:17593681
Change-Id: I3fe95fa23ba43ac2dc3692fd28309b2f8e5a3599
2014-09-24 14:35:32 -07:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
2014-09-24 14:35:32 -07:00
Lajos Molnar
00bbc7d9fa MediaCodec: revalidate cached queued input buffers if queue fails
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails.  Otherwise, it becomes unusable,
and the buffer still belongs to the user.

In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.

We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).

Bug: 17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
2014-09-24 14:12:08 -07:00
Ruben Brunk
9a417052be am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit 'e9858c6a5aefe2aec45a89204fab34246ff4448a':
  camera2: Update CamcorderProfile documentation.
2014-09-24 17:56:38 +00:00
Ruben Brunk
63c8e126e7 Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 2014-09-24 17:54:18 +00:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers.
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
2014-09-24 10:43:12 -07:00
Ruben Brunk
27a845cf7c camera2: Update CamcorderProfile documentation.
Bug: 17447258

- Update documentation in CamcorderProfile for LEGACY
  mode video handling.

Change-Id: If65b93788a38ffe28caec053f81b9afa538c38a0
2014-09-24 06:59:53 +00:00
Eric Laurent
c1aa0838c8 am 337f4b98: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
* commit '337f4b982e2405499270f4ea13abfa3cb221d3c6':
  AudioRecord: add HW hotword capture flag
2014-09-24 02:35:45 +00:00
Eric Laurent
c1823452ad Merge "AudioRecord: add HW hotword capture flag" into lmp-dev 2014-09-24 01:39:35 +00:00
Jeff Tinker
6adabab374 am c3ae3aea: am 3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit 'c3ae3aea8f1f99e05c711a712f371b5bb5b919ff':
  Implement API review feedback.
2014-09-23 17:54:06 +00:00
Jeff Tinker
f7efd5c6a8 Merge "Implement API review feedback." into lmp-dev 2014-09-23 17:39:31 +00:00
Christoph Studer
ec357d73cd am c647e050: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit 'c647e050aa609f12b646258b2383fceca52c2db0':
  SysUI: Correctly compare MediaControllers
2014-09-23 17:23:34 +00:00
Jeff Tinker
21069d1914 Implement API review feedback.
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
2014-09-23 01:35:41 +00:00
Eric Laurent
bdad1afa92 AudioRecord: add HW hotword capture flag
Bug: 17575019.
Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
2014-09-19 17:43:29 -07:00
Dan Albert
c04d92cac9 resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
2014-09-19 15:57:26 -07:00
Christoph Studer
b5245d8904 SysUI: Correctly compare MediaControllers
Instead of comparing MediaControllers via reference equality
(which is never true), go deeper and check whether the two
controllers are connected to the same IBinder.

Bug: 17571414
Change-Id: Id25d70be0a60d1900e977310dedcc7063552e018
2014-09-19 16:55:45 +02:00
Jungshik Jang
1a6be6ed39 Adjust volume bar visibility in HDMI-CEC system audio mode
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
   Audio Receiver.

Otherwise, (system audio mode off) follows normal TV's behavior.

Bug: 17347499

Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
2014-09-17 10:28:40 +09:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm.
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
2014-09-16 12:07:41 -07:00
Jungshik Jang
c9ff968787 Fix volume change failure in HDMI-CEC system audio mode.
In order to get volume change event, output device should not be
in fixed volume device. This change ignores CEC releated outputs
if system audio mode is on.

Along with this, fix invalid output from getStreamForDevice
as AudioPolicManager does.

Bug: 17502272
Change-Id: I7d4406caea7fa6617f17969dc61aabebb87ecf7d
2014-09-16 10:12:41 +09:00
Jeff Tinker
a526ba1217 Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev 2014-09-15 23:37:08 +00:00
Jeff Tinker
6998c37139 Document retry behavior for MediaCodec.CryptoException
bug: 17469693
Change-Id: I8cc204938b28451c638be017ebb499f525fcff50
2014-09-15 11:47:16 -07:00
Jae Seo
ee2ec05ed7 TIF: Turn debugging off
Bug: 17476383
Change-Id: I28ff54a635bf6468c231efe776dbc8e35460d542
2014-09-14 10:30:05 -07:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Jean-Michel Trivi
f47ff5bf97 Merge "more AudioAttributes javadoc" into lmp-dev 2014-09-12 23:45:23 +00:00
Jae Seo
3c8e65a307 TIF: Add a system API to retrieve HDMI device information
Bug: 17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
2014-09-12 16:17:51 -07:00
Jean-Michel Trivi
04f55a490d more AudioAttributes javadoc
Expand the AudioAttributes and associated Builder javadoc.

Bug 17059703

Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
2014-09-12 15:56:46 -07:00
Jean-Michel Trivi
873cc45da2 AudioService: modify stream delay for touch exploration
When accessibility services are running, in particular touch
 exploration, the default stream override delay in AudioService
 makes it hard for the user to change the notification volume
 as when TalkBack speaks, the user would control the media
 volume during the utterance, and up until 5s after its end.
Use a shorter delay when touch exploration is enabled.

Bug 17140435

Change-Id: Iabadb9778f2957b5aa0aebd1599f2d69bd83222b
2014-09-12 10:26:24 -07:00
Dan Albert
88ba339aef Clean up makefile cruft.
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
2014-09-11 16:21:19 -07:00
Michael Wright
cde5bb45cc Change callback methods from add to register.
Also changes intent returning method from get to create. Both changes
are in response to API council feedback.

Bug: 17389882
Change-Id: I3b57e3fc202148e3bbb24ac61229f04e8b4ac41e
2014-09-11 19:37:30 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Youngsang Cho
db8f7ab752 Fix build breakage
Change-Id: Ic52e2d767f3adfedfa4e78aa2510d480c537c857
2014-09-11 11:22:07 +09:00
Terry Heo
d608f3abac Merge "Add a system API to query hdmi system audio mode" into lmp-dev 2014-09-11 01:35:07 +00:00
Chulwoo Lee
19ba61affb Notify of the update of TvInputInfo
The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
   available.
3. the media on which a newer version of TV inputs exists become
   unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
2014-09-11 10:32:00 +09:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
2014-09-10 17:58:09 -07:00
Eric Laurent
ea9aa9a282 Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev 2014-09-10 22:37:26 +00:00
Eric Laurent
4fc28d78cb AudioEffect JNI: fix queryEffects()
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.

Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
2014-09-10 15:05:03 -07:00
Jae Seo
9127e4580c TIF: Enable inflating class android.media.tv.TvView on non-TV devices
Needed to pass the CTS for those devices.

Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
2014-09-10 13:11:13 -07:00