8745 Commits

Author SHA1 Message Date
Yao Chen
cc491cacf8 am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
* commit '1769e28d34857bf78708c595e7ce71759aa961ea':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:17:15 +00:00
Yao Chen
6f05ae578e am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
* commit '86d778155f077d5af10f43d0eb7b04584559e793':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:02:43 +00:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
RoboErik
28c86a16c0 am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '7df9365479e7e775bdaf32d9b5ed9a6eabcfa1fe':
  Ensure MediaBrowser state is set to connecting after a reconnect
2014-09-26 00:23:48 +00:00
RoboErik
00bbe915de am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '5e8f023dc17788a18bc5640a42baaf2bec609745':
  Allow null queues to be set in MediaSession
2014-09-26 00:23:43 +00:00
RoboErik
1dc5ba8665 Disable MediaSessionLegacyHelper debugging
Switched over to using Log.isLoggable instead for release.

Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
2014-09-25 14:57:35 -07:00
RoboErik
5535ea8ef8 Remove BT routes when BT is turned off
A behavior change in the BT stack caused it to stop sending connection
changes for connected devices when you turn BT off. To work around this
we need to remove the connected BT route when BT is turned off.

bug:17512270
Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
2014-09-25 14:57:35 -07:00
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
87fb4fb9c1 am bf14a4e6: am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit 'bf14a4e6ea6f2c70152a9456ed790fc460734e16':
  MediaCodecList: fix findEncoderForFormat.
2014-09-25 17:06:13 +00:00
Lajos Molnar
59432a4c7e am a91920f0: am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
* commit 'a91920f0f81e32dbfd408db8b0e26c139fdded74':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
2014-09-25 17:06:04 +00:00
Lajos Molnar
94831b82be am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '36dbe967a0027842abe9051ddc4a87704785f84c':
  MediaCodec: revalidate cached queued input buffers if queue fails
2014-09-25 17:05:47 +00:00
Ruben Brunk
ea06d48527 am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
  camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 10:24:12 +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
Yao Chen
2354c5eb92 Check the return value of bindService, and notify media browser client
onConnectionFailed if it returns false.

Bug: 17637058
Change-Id: I2284c3a982e5ac6323f51ff7d98aae7699c695e5
2014-09-24 21:45:58 +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
0298d5cfe0 am 58dfddad: am b0069340: am 96cf7438: am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev
* commit '58dfddad306abffc036b1bb875f4480a638e158a':
  camera2: Update CamcorderProfile documentation.
2014-09-24 18:27:51 +00: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
0441fb8439 am 2e0cb3c9: am 02e49c71: am b7e8fdce: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
* commit '2e0cb3c9c7654ef97aa0d8994452e26752321ca1':
  AudioRecord: add HW hotword capture flag
2014-09-24 04:13:59 +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
Jon Eklund
3e9774aba9 AudioService: Fix monitorRotation for landscape applications
Current implmntation only sends rotation updates on orientation
changes, so does not handle direct 0<->180 or 90<->270 transitions.

Update rotation based on an OrientationEventListener instead of
Intent.ACTION_CONFIGURATION_CHANGED

Bug 17606902

Change-Id: I01dfcd1c587f5b2e8a96365c2389782ad77936ef
2014-09-23 16:31:52 -05:00
Jeff Tinker
6f77dd8495 am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit 'a55b9bccd0df738a5e3a4fb5676450e1e138a941':
  Implement API review feedback.
2014-09-23 18:17:25 +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
Christoph Studer
ccc3f012b0 am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit 'b83d9dc3e1d853d43807375d79d90739e572b938':
  SysUI: Correctly compare MediaControllers
2014-09-23 17:48:30 +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
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
2014-09-19 16:13:49 -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