8166 Commits

Author SHA1 Message Date
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
Sungsoo Lim
f76ba856f3 Merge "Print a warning message instead of throwing IllegalStateException" 2014-06-17 22:28:18 +00: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
Wonsik Kim
d7c29189aa TvInputHardware: Integration with audio framework changes
TvInputHardwareManager detects AudioPort specified by tv_input and
connect source to sink via AudioManager.createAudioPatch().

Bug: 15177175
Change-Id: I2252eb0df2d8287889ed28cc7d76dc1a659fd08b
2014-06-19 10:35:33 +09:00
Jae Seo
3bbd9be166 Merge "TvContract: Change constants of canonical genres to all-caps values" 2014-06-19 00:17:11 +00:00
Jae Seo
0e33c1286d Merge "TvContract: Add columns for video format and resolution" 2014-06-18 18:28:24 +00:00
Jae Seo
acc1957d78 TvContract: Change constants of canonical genres to all-caps values
This is just for consistency with other constant values.

Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6
2014-06-17 19:44:10 -07:00
Jae Seo
68e0de81d5 TvContract: Add columns for video format and resolution
Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical
video format for programs from a given TV channel, which can later be
used to filter out channels. Also defined common video formats and
resolutions and a utility method to get the video resolution for a given
format.

Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table
to indicate the actual video dimension for each individual TV program,
which can be shown as a part of program information by applications.

Bug: 15351111, 15456031
Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81
2014-06-17 19:41:43 -07:00
Andy Hung
1ae1fd4692 Merge "Fix AudioFormat getBytesPerSample to recognize float" 2014-06-17 21:46:58 +00:00
Andy Hung
2854ed5025 Fix AudioFormat getBytesPerSample to recognize float
Bug: 15719638
Change-Id: Id53a07ef24e4403f3bad7a13c4dd801e556769eb
2014-06-18 10:51:15 -07:00
Robert Shih
7d4769c183 Merge "Move SubtitleData processing to SubtitleTrack" 2014-06-18 17:00:38 +00:00
Jae Seo
5c80ad2077 Clean up the EPG data when a TV input package is removed
Also removed an unused parameter from sendSessionTokenToClientLocked().

Bug: 14981342
Change-Id: I5bcf6050386a2bc3e216f44420390c4b78282af4
2014-06-18 10:10:07 -07:00
Robert Shih
38c209b938 Move SubtitleData processing to SubtitleTrack
Change-Id: Ia338a7a1b51e449d0ab6df9933ea0efcc2d12849
2014-06-17 16:12:14 -07:00
Igor Murashkin
4961bc88d7 camera2: Map camera characteristics in the managed layer
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
2014-06-17 22:55:16 +00:00
Sungsoo Lim
dc952584e3 Print a warning message instead of throwing IllegalStateException
In TvInputManager.java, when postSessionReleased() is called but
onSessionReleased() is not called yet, mToken is null, and it's not
an illegal state.

Bug: 15095124
Change-Id: Icd2a84ae350d9979e3cef4dbd3a73699e05e7c2a
2014-06-17 15:27:57 +09:00
Jae Seo
cf9bec5bb6 TvContract: Enable building programs URI also with channel ID
Bug: 15446137
Change-Id: I322c1b90c272e553b028af1f9011feecde124915
2014-06-16 17:55:32 -07:00
RoboErik
2fc02ba031 am 276777ea: b/15676582 Fix ordering of sessions returned by MediaSessionManager
* commit '276777ea10dadd27cd9fad5260e41dfed6cfa34a':
  b/15676582 Fix ordering of sessions returned by MediaSessionManager
2014-06-17 00:07:13 +00:00
RoboErik
6b1bea0903 b/15676582 Fix ordering of sessions returned by MediaSessionManager
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.

Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
2014-06-16 16:59:37 -07:00
Marco Nelissen
1c46ae419c Merge "Don't send unneeded messages." 2014-06-16 21:50:51 +00:00
Marco Nelissen
48163e060d Don't send unneeded messages.
This is significantly faster, and doesn't caused messages to pile
up on a looper that might not be processing them.

Change-Id: I2d3536d1f12c71a214c181523dcd60810de3029d
2014-06-12 13:22:16 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
2014-06-12 00:06:20 +00:00
RoboErik
430fc48865 Work on removing non-session media routing code
Change-Id: I73e7d22f2f8772c7b07ccf32d962161d79d5db74
2014-06-16 14:00:16 -07:00
Chong Zhang
19ed4a179c implement edge styles and underline for closed caption
Bug: 15470448
Change-Id: I52f6921f85486c05905ac3ae69d2edae9f11667d
2014-06-16 12:57:35 -07:00
Emily Bernier
c5db4bfb10 Merge "Add an app ops code for microphone muting." 2014-06-14 02:21:10 +00:00
Emily Bernier
22c921a910 Add an app ops code for microphone muting.
When OP_AUDIO_MICROPHONE (linked to the DISALLOW_UNMUTE_MICROPHONE user
restriction) is set, the system blocks calls to setMicrophoneMute.

Bug: 13585692

Change-Id: Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
2014-06-16 11:25:22 -04:00
Chong Zhang
90c91c2adf Merge "support for CEA-608 closed caption" 2014-06-12 17:09:07 +00:00
Chong Zhang
86cdd73d76 Merge "change onData() to take byte array of raw data" 2014-06-12 17:09:07 +00:00
Chong Zhang
bdfd910247 support for CEA-608 closed caption
Bug: 15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
2014-06-11 17:57:23 -07:00
Chong Zhang
079fa9683d change onData() to take byte array of raw data
conversion to UTF-8 if necessary will be handled by the renderer.

Bug: 15470448
Change-Id: I6d4a5e29e6af07f5c031197ea424f8f8e53cd05b
2014-06-11 16:35:46 -07:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
2014-06-11 14:43:57 -07:00
Ji-Hwan Lee
162d6999e3 jpeg_bench: Fix checkbuild
Change-Id: I73d82ffc022be4fc78ff0d8b62ab541dd896df24
2014-06-13 20:16:15 +09:00
Jae Seo
796691e302 Merge "Add an API to get TV input icon" 2014-06-12 03:30:50 +00:00
Jaewan Kim
cca74c1b0d Add an API to get TV input icon
Bug: 14423022
Change-Id: I7b3c0efadc8448cae56ef370611be8e09a301f42
2014-06-12 10:36:00 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
2014-06-12 18:49:02 +00:00
RoboErik
73e23e229d b/15330955 Make RemoteController use the new session APIs
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
2014-06-11 10:58:52 -07:00
Jae Seo
3a0f19980d Add channel types for NTSC, PAL and SECAM
Bug: 14451655, Bug: 15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
2014-06-11 18:25:11 -07:00
Elliott Hughes
f4c6a154e9 am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit 'b952587184572070805243e6f8380ceb769f441c':
  Switch to a type-safe album art interface.
2014-06-12 00:15:38 +00:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
2014-06-10 22:16:41 +00:00
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
2014-06-10 12:44:04 -07:00
RoboErik
e252909394 am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
  Adds listeners for changes to the list of active sessions
2014-06-09 19:29:58 +00:00