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

8367 Commits

Author SHA1 Message Date
RoboErik
98cb95a998 Merge "Change URI type metadata back to text" into lmp-dev 2014-08-06 23:49:20 +00:00
RoboErik
67098d0963 Unhide MediaMetadata.Description 
This unhides the method and inner class for getting a small version
of the metadata for display.

Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
 2014-08-08 17:16:37 +00:00
Ji-Hwan Lee
ca18eb045b Merge "TIF: Make TvContract URI consistent" into lmp-dev 2014-08-07 16:56:07 +00:00
Ji-Hwan Lee
156aeecef2 TIF: Make TvContract URI consistent 
- input/*/channel -> channel?input=*
- channel/#/program -> program?channel=#

Bug: 16806157, Bug: 16804331
Change-Id: Idbded032da166e789148c4b8e38ea521468fd9fa
 2014-08-08 22:15:00 +09:00
Michael Wright
6720be4e8c Allow media projections to create public presentations. 
Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
 2014-08-07 20:07:04 +00:00
Andy Hung
9e4a66d696 Fix track sample rate limit 
Should be controlled by SAMPLE_RATE_HZ_MIN and SAMPLE_RATE_HZ_MAX.
Associated with testing the following sample rate bugs.

Bug: 12979141
Bug: 15933066
Change-Id: Id130613fe28c7a1070e42f9bc44ed3b00a4113a3
 2014-08-08 01:38:15 +00:00
Lajos Molnar
cd5e3f95bf media: update to reworked media codec list/info 
Bug: 11990470
Change-Id: I884d656f6a325f7074a89d09601ad19363daa8a0
 2014-08-07 17:27:20 -07:00
Glenn Kasten
5f51635484 Add setting to disable automatic USB audio routing 
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
 2014-08-07 10:31:53 -07:00
Jae Seo
579befecb2 TIF: Do not log non-searchable channel watch history 
Bug: 16798476
Change-Id: Ic131009ad65a661331e4f8f0820c5c183a9f4986
 2014-08-07 10:00:52 -07:00
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +00:00
Lajos Molnar
8d563a2077 ImageReader: fix documentation, relax some guarantees 
MediaCodec does not guarantee any of this.

Change-Id: Id73c917baad9ca72de87b98c16374505c8028e86
 2014-08-06 20:00:10 -07:00
Terry Heo
df9f0a321e TIF: Add system API 'isSingleSessionActive()' 
Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
 2014-08-07 08:07:17 +00:00
Jungshik Jang
61f4fbd2e8 Rename HdmiCecDeviceInfo into HdmiDeviceInfo. 
In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.

BUG: 16215362

Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
 2014-08-07 11:14:15 +09:00
Youngsang Cho
5caf1e8dda Make caption setting consistent across sessions 
Change-Id: I7cb8ab109188b9f78cceb1025339bce98c776052
 2014-08-07 00:48:50 +00:00
Yao Chen
dc33b6170b Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev 2014-08-06 17:19:40 +00:00
Yao Chen
51fdfa273e Adds getServiceComponent() to MediaBrowser, getQueueTitle() and 
getExtras() to MediaController

Change-Id: I6092ac1ae05ba55c14a042698bb88bd16e9b1fa7
 2014-08-06 14:10:41 -07:00
Eric Laurent
b287c9388e Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev 2014-08-06 17:14:55 +00:00
Eric Laurent
b634e1b6d6 AudioSystem: add API to query audio HW sync source 
Add a method to query from the audio HAL the HW sync
source used for a given audio session.
Add an AudioAttributes flag to request an output with
HW sync source.

Bug: 16132368.
Change-Id: Ic31b2924b98f242c3aa0d58688879f05ea02d6f7
 2014-08-05 16:56:12 -07:00
Sungsoo Lim
022e7cc298 Merge "TIF: Add content ratings for Australia" into lmp-dev 2014-08-04 23:56:40 +00:00
Sungsoo Lim
1fd38bd996 TIF: Add content ratings for Australia 
Reference: http://www.classification.gov.au/

Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
 2014-08-06 15:11:26 +09:00
Youngsang Cho
ac8c3d3358 Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-dev 2014-08-05 00:07:36 +00:00
Youngsang Cho
3d13aec546 Remove a Handler constructor parameter Looper in TIS 
getMainLooper() returns null in the variable initialization phase.

Change-Id: Iebe52eac8955c0a8394501575f90ff6f2825451c
 2014-08-06 15:44:35 +09:00
Youngsang Cho
ff04ae757a Add a method in TIS to relayout SurfaceView 
Bug: 15389458
Change-Id: I7f740141e7cf59fea5d321099652e65bc9e5f7d1
 2014-08-06 14:53:28 +09:00
Youngsang Cho
887ad97ebe Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev 2014-08-05 00:03:09 +00:00
Jae Seo
9551e92507 TIF: Add explanation for TvView 
Bug: 16801733
Change-Id: I8fa81a850d1e29f32fdb6caa4bd3dc4b2668e18a
 2014-08-05 23:09:13 -07:00
Dongwon Kang
65dc05248e Merge "TIF: Add content rating system for Spain" into lmp-dev 2014-08-05 00:03:09 +00:00
Dongwon Kang
b1caf4d817 TIF: Add content rating system for Spain 
References:
 - http://codigodeautorregulacion.rtve.es/senalizacion-de-los-programas/advertencias-opticas/
 - http://en.wikipedia.org/wiki/RTVE

Change-Id: Icdde8a7f8cfb07cc4f768f95ba764ae6a519e347
 2014-08-06 11:48:45 +09:00
Dongwon Kang
66b9e91801 TIF: make TvInputService.Session class static 
This change would make the developers freely extend the Session class
out of the TvInputService class.

Change-Id: I7dc9501c771a6e4dcfcceeb1b294b95e612596eb
 2014-08-06 11:15:30 +09:00
Youngsang Cho
bf0a4eb158 Add system APIs to set Z-order of TvView 
Bug: 16723028
Change-Id: I43c840ca2065920360859f8814a0c76ab2937ac1
 2014-08-06 10:01:08 +09:00
Sungsoo Lim
8811f3457e Merge "TIF: Add content ratings for Netherlands" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
3596a9645e TIF: Add content ratings for Netherlands 
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
 2014-08-06 09:26:50 +09:00
Sungsoo Lim
2df7e30839 Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
39ddf8ddc4 Merge "TIF: Add content ratings for Germany" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
6b444eed2c TIF: Add content ratings for Germany 
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
 2014-08-06 09:29:58 +09:00
Sungsoo Lim
f0bcee493d Merge "TIF: Add content ratings for France" into lmp-dev 2014-08-04 23:56:40 +00:00
Sungsoo Lim
4acc7c3f4e TIF: Add content ratings for France 
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
 2014-08-06 09:00:53 +09:00
Dongwon Kang
e377ea5de6 Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
b4bbfbcef3 TIF: Add a content rating system for Brazil 
- Add Brazil TV content ratings
- Remove Italy TV content rating since it doesn't have the official one.

References:
http://en.wikipedia.org/wiki/Brazilian_Advisory_Rating_System
http://portal.mj.gov.br/services/DocumentManagement/FileDownload.EZTSvc.asp?DocumentID=%7B25A80220-B0E3-47FD-923F-246B6184C3C6%7D&ServiceInstUID=%7B59D015FA-30D3-48EE-B124-02A314CB7999%7D

Change-Id: Ibed9b4be0871b50b9dcd95be3a015f5a1e58676d
 2014-08-06 21:33:56 +09:00
John Spurlock
5f72e16847 Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev 2014-08-05 00:35:13 +00:00
John Spurlock
4f0f120316 AudioService: getMasterStreamType -> RING on tablets. 
Since all service-internal checks use stream alias, and the alias
for NOTIFICATION is RING, even on tablets.

This is a followup to ag/506532.

Ensure that #getMasterStreamType always follows the stream_system
alias, and update the system alias for tablets per the new policy.
Update the associate javadoc comment in AudioManager to make this
clear.

Note: there is now no difference in the alias maps between phones
and tablets.

Also fix a condition affected by this in VolumePanel.

Bug:16626879
Change-Id: I2700a48d2a3e7703607f771a1ab7f325596fd789
 2014-08-05 16:23:14 -04:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Jean-Michel Trivi
fe3e10deaf Merge "AudioAttributes: implement hashcode and equals methods" into lmp-dev 2014-08-05 00:39:51 +00:00
Jae Seo
dfab517fb2 Merge "TIF: Make selected tracks identifiable" into lmp-dev 2014-08-04 23:42:57 +00:00
Jae Seo
10d285ac06 TIF: Make selected tracks identifiable 
A recent change on the multi-track API surfaced an issue that it's hard to
identify selected tracks from the list of tracks obtained from
TvView.getTracks() method, especially when two or more tracks convey the same
track information (e.g. two English stereo audio tracks with the same sample
rate). This change introduced a new public method getId() in TvTrackInfo that
returns an ID with which one can identify the tracks uniquely. It also led to
minor signature changes across the multi-track API to make it more
developer-friendly in both application and TV input service developers'
perspectives.

Change-Id: I226f75e697b0ce52b44db7471660f6d9f646f6f9
 2014-08-05 12:06:49 -07:00
RoboErik
75847b98f3 Add display metadata and change strings to CharSequences 
This adds some fields for display purposes to MediaMetadata and also
makes the default for all text CharSequence instead of String. Also
adds a hidden method for getting a Description for the metadata.

bug: 11708293
Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
 2014-08-05 14:30:27 -07:00
Jon Eklund
43cc8bbbbd Add support for line out audio device 
Change-Id: I48750511b56a2bc5f06b7bdd11cfb4e0cd2728af
 2014-08-05 20:27:40 +00:00
Sungsoo Lim
f128dbf076 Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
e6dca2cfa4 TIF: A preliminary CL to add multiple rating systems 
TODO: Add rating systems for the countries defined in this CL.

Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
 2014-08-05 17:35:38 +09:00
Dongwon Kang
1f81b1040f TIF: make the documentation consistent. 
Change-Id: Iaf93c8753c43fa128b464cea3f63a38fb7b3c8b3
 2014-08-05 15:49:43 +09:00
Wonsik Kim
8e45a33ca8 TIF: implement setVolume for hardware inputs 
Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
 2014-08-05 10:33:08 +09:00