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

8050 Commits

Author SHA1 Message Date
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
RoboErik
03df2c5153 am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
  b/15388389 Add volume handling support to MediaRouter
 2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5 am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
  Add a way to get the package/pid of the session
 2014-06-09 19:29:48 +00:00
Jae Seo
8799179638 am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev 
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
  Fix a typo in TvContract
 2014-06-09 19:29:28 +00:00
Jae Seo
9aea9c93c5 am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3
 2014-06-09 19:29:17 +00:00
RoboErik
a3d8188556 Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev 2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81 Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev 2014-06-09 19:07:34 +00:00
RoboErik
20685929a4 Merge "Add a way to get the package/pid of the session" into lmp-preview-dev 2014-06-09 19:07:20 +00:00
Jae Seo
085eefd184 Merge "Fix a typo in TvContract" into lmp-preview-dev 2014-06-09 18:43:27 +00:00
Jae Seo
182dc33e9e Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev 2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state. 
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
 2014-06-09 14:18:01 -04:00
Jae Seo
f30ea53306 Fix a typo in TvContract 
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.

Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
 2014-06-09 17:50:07 +00:00
Wonsik Kim
32c67ee119 am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev 
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
  Make TvInputs aware of whether it's hardware-based or not
 2014-06-09 17:44:37 +00:00
Elliott Hughes
f928103269 am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:37:31 +00:00
Elliott Hughes
ef00c16d62 am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:33:39 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00