8005 Commits

Author SHA1 Message Date
Jean-Michel Trivi
6c09004ec0 Send media button events with FLAG_RECEIVER_FOREGROUND set
bug 11357318

Change-Id: Iccd000bebb31a2f6cb057e97d3ab276861d0b651
2014-07-02 21:10:43 +00:00
Jae Seo
6e90e4ea4f TvContract: Add a field for network affiliation to the Channels table
This is used to identify a channel that is commonly called by its
network affiliation instead of the display name.

Bug: 15993156
Change-Id: Ib5a15e0e44e815c98b762573b5a24289a86f9583
2014-07-02 13:01:35 -07:00
Eric Laurent
7edabadf78 Merge "AudioManager: add isVolumeFixed() API" 2014-07-01 23:33:37 +00:00
Eric Laurent
ba207e76b2 AudioManager: add isVolumeFixed() API
Indicates if the device implements fixed volume policy.
In this case, volume control APIs are not operational.

Bug: 11430859.

Change-Id: Ia82bdfe5b38d6b2ce132f00a493e6a04cb794ea0
2014-07-01 19:03:04 -07:00
Marco Nelissen
a4d4c200e4 am 1ed64c65: am 899c15ef: am db816cef: Merge "Make sure we clean up"
* commit '1ed64c65a7b4d33799ca42cb4422d8382929cac2':
  Make sure we clean up
2014-07-01 18:28:56 +00:00
Marco Nelissen
1ed64c65a7 am 899c15ef: am db816cef: Merge "Make sure we clean up"
* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up
2014-07-01 18:21:41 +00:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Santos Cordon
e19a4fe32f Merge "Move call-related SystemAPIs to TelecommManager. (1/3)" 2014-07-01 14:48:56 +00:00
Jean-Michel Trivi
8df982dfa5 Java MediaPlayer: add support for setting audio attributes
Change-Id: Ia638107a5e67c20c46c2f5f1800db9da57d6f698
2014-07-01 16:45:29 +00:00
Santos Cordon
9eb45934c5 Move call-related SystemAPIs to TelecommManager. (1/3)
Bug: 15672803
Change-Id: I46e448fe93a9c5b4ae013e8b2fd6f0ce89b94e69
2014-06-30 16:30:10 -07:00
Jeff Brown
8fef877310 Merge "Make MediaSessionToken an inner class of MediaSession." 2014-06-30 22:24:07 +00:00
Jeff Brown
dba34ba35c Make MediaSessionToken an inner class of MediaSession.
Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
2014-06-30 16:05:25 -07:00
Dongwon Kang
b973baca3b Merge "Add a column to TV channel metadata to enable a newly requested use case" 2014-06-26 23:14:30 +00:00
Chulwoo Lee
9e4a5ac751 Add a method to build channels uri for genre
BUG: 14069779
Change-Id: Ic4aa0f6a1ef154d680a5540140958cf4e735257c
2014-06-30 06:11:33 +00:00
Paul McLean
fb917e019f Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output
Bug: 13747844

Change-Id: Ia969dad4150adeafb375e3f9985f9d8ba7222638
2014-06-27 08:44:55 -07:00
Youngsang Cho
07b7c5fa4c Turn on/off an overlay view by visibility change in TvView
Bug: 15873405
Change-Id: I0e6db7fb61af6d79cbfc00cefddd8ba2a0a7ee7e
2014-06-27 16:21:07 +09:00
Dongwon Kang
2b53aae90c Add a column to TV channel metadata to enable a newly requested use case
conditional_access :
    Used to let user know this channel is scrambled by a conditional access
    system and need to contact the service provider to watch it.

Bug: 14073703
Change-Id: I62d744b92e31fbbb95ba10b2595686114f6fbb6f
2014-06-24 14:57:50 +09:00
Youngsang Cho
6d8a7d7009 Merge "Properly handle navigation keys in TIS" 2014-06-24 01:52:26 +00:00
Youngsang Cho
44fbbca354 Properly handle navigation keys in TIS
If the navigation keys are dispatched to an overlay view and
the overlay view has focusable views, the navigation keys should
be always handled.

Bug: 15174809
Change-Id: Ia7490880243342e08e4502644e1864e4c583ee1d
2014-06-25 17:33:55 +09:00
RoboErik
d09bd0c6eb Move VolumeController into AudioService
VolumeController was a hidden class only used by AudioService and
MediaFocusControl. Since we added a public VolumeProvider class
moving VolumeController to avoid confusion.

Change-Id: I6838daf9b83846e1393b1a8502d3b10345a4799a
2014-06-25 14:36:51 -07:00
RoboErik
19c9518f6a b/15729204 Pipe sessions through to VolumePanel
When remote volume is changed via volume buttons we need to notify
the system UI so it can show the slider. This also passes it the
controller to use so adjustments to the slider are sent back to
the correct session.

Change-Id: If5847bcd5db16c56e0e9904b88c94e5b28954c41
2014-06-25 14:36:51 -07:00
Jeff Tinker
3b6ec30bff Fix exception discrepancy in MediaDrm.openSession
bug: 13792521
Change-Id: I2e47ce754c1e560315bf2bf1144d94e01472e392
2014-06-25 17:20:33 +00:00
Dan Stoza
0479c3b23e Merge "GLConsumer: Stop using default constructor params" 2014-06-25 03:38:12 +00:00
Jean-Michel Trivi
e4e223ced0 Merge "AudioTrack Java constructor with AudioAttributes and AudioFormat" 2014-06-25 03:33:37 +00:00
Jean-Michel Trivi
a1d80e3b1d AudioTrack Java constructor with AudioAttributes and AudioFormat
Change-Id: I82758a4231b8dc0b8d8e72acf3c896a289c28f60
2014-06-24 17:02:06 -07:00
Dan Stoza
ffdbe97f8e GLConsumer: Stop using default constructor params
Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.

Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
2014-06-24 13:06:28 -07:00
Jeff Brown
bf58d9b727 Minor cosmetic tweaks.
Change-Id: I626bad7177659b5670c2864d7bc78033a0ee16e7
2014-06-24 21:19:50 -07:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
2014-06-23 21:51:38 +00:00
Chong Zhang
c4e976daa2 Merge "don't select default track if subtitle controller is not present" 2014-06-24 17:32:43 +00:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
2014-06-24 18:29:18 +00:00
Chong Zhang
7026020398 don't select default track if subtitle controller is not present
subtitle controller won't be there if app is not using VideoView.

Bug: 15470448
Change-Id: If6724928220a8906bd2199ebc0916a4493092abb
2014-06-24 10:56:53 -07:00
Marco Nelissen
b416af13e7 Fix thumbnail bug
When there was no thumbnail for a given image, the getThumbNail() convenience
method could return a previously-returned thumbnail instead of null.

b/15771860
https://code.google.com/p/android/issues/detail?id=40714

Change-Id: Ibd18e048145bf347469f800afdf436247ea6b693
2014-06-20 14:10:00 -07:00
RoboErik
51fa6bcb22 b/15757378 Expose APIs for listening to active sessions
This allows apps that are registered notification listeners to
listen to the set of active sessions.

Change-Id: I1e108951a5049d138208e88b155c0ec9b95fbdb0
2014-06-23 16:29:52 -07:00
Marco Nelissen
d3afc9c1d8 am 909a1b2e: am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"
* commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14':
  Fix thumbnail bug
2014-06-23 22:40:28 +00:00
Ruben Brunk
5e6421bd8f Merge "camera2: Switch to using YV12 for ImageReader." 2014-06-20 20:43:34 +00:00
Ying Wang
7c0e6219c3 Fix build.
Change-Id: I2b161a4020862d83347d5a8989467c612fff08db
2014-06-20 17:30:45 -07:00
Ruben Brunk
91b9aabc9f camera2: Switch to using YV12 for ImageReader.
Bug: 15116722

- Also fixes incorrect frame number for single captures.

Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
2014-06-20 15:59:00 -07:00
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
2014-06-20 13:41:30 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
2014-06-20 13:39:41 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
2014-06-20 10:28:37 -04:00
RoboErik
6f0e4ddd66 Remove more dead audio service code
Hit a snag in remote volume changes. Trying off this round of
removal so I can work on fixing remote volume handling in a
separate CL.

Change-Id: I49b1ba4b75d770ba7c77da081755f3210a9e9483
2014-06-20 11:35:20 -07:00
Eric Laurent
1cff3844da update SCO audio test app
Added test for startBluetoothScoVirtualCall()

Change-Id: I1b47b60a8c5fb0158d4e224252a9d511c612ca2f
2014-06-20 17:49:06 +00:00
Eric Laurent
83900754f3 AudioManager: add startBluetoothScoVirtualCall()
Add API to start bluetooth SCO audio connection explicitly
in virtual call mode.

Bug: 11824396.
Change-Id: I1dfab13c659f5855e0b78467ac48b3186af7874c
2014-06-20 10:17:47 -07:00
Zhijun He
6e335c44c6 Merge "Camera: Implement HAL1 and higher HAL API coexistence" 2014-06-19 20:37:59 +00:00
Zhijun He
4c91380114 Camera: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
2014-06-19 15:46:02 -07:00
RoboErik
d3c8642dae Remove some more old code and fix Media command
Removes some more hidden apis from AudioService/Manager. This also
fixes up Media.java to support commands for the new service to help
with debugging. Also fixes a couple bugs that were found while fixing
up Media.

Change-Id: I68e4aa80a4de430b98236aafc883664b9432c62b
2014-06-19 10:37:00 -07:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
2014-06-19 10:13:33 -07:00
Wonsik Kim
a358b53e1d TvInputHardware: Add HDMI port ID
Bug: 15570939
Change-Id: I957804124fa5e417de8c98c6d41332609097d995
2014-06-19 10:35:33 +09:00