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

3107 Commits

Author SHA1 Message Date
Jean-Michel Trivi
6894cd38eb Define FLAG_BEACON in android.media.AudioAttributes 
Define FLAG_BEACON as @SystemAPI
Keep track of which flags are public, and the list of all
 supported flags for easier code maintenance.

Bug 15415971

Change-Id: Ia7675e8fa4bc7c4d7a8f727fd25ff92ecb68483c
 2014-08-08 12:16:12 -07:00
Rachad
73fc533b2e Added Tunneled video playback support to MediaCodec 
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
 2014-08-09 01:29:43 +00:00
Dongwon Kang
9dfd731db5 Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 2014-08-08 20:34:05 +00:00
Dongwon Kang
4d933a0ef0 TIF: introducing TvInputSettings for put/getting user preferences from Settings. 
Reference:
  - Settings.Secure.ENABLED_INPUT_METHODS
  - InputMethodSettings

Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
 2014-08-08 21:36:50 +00:00
Dongwon Kang
c566ca54b1 TIF: fix a regression introduced while addressing merge conflict in TIS 
Plus, a small code refactoring on DO_CREATE_SESSION for lower indentation
depth.

Bug: 16833301
Change-Id: Id0cb2df26015ea8286a1cf03024c44fa15f2628e
 2014-08-08 21:36:38 +00:00
RoboErik
6d9fe654b5 Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 2014-08-08 17:26:08 +00:00
RoboErik
477d1197c3 Combine MediaSession Callback and TransportControlsCallback 
This combines them into a single Callback class and adds default
handling to media buttons to check the available actions and call
one of the other methods if appropriate.

Change-Id: If9897d8cf6d8d8046aa85a646c22382f1db1461b
 2014-08-07 16:54:52 -07:00
RoboErik
217e8a2b46 Change URI type metadata back to text 
Was accidentally changed in a previous CL. We decided against adding
the URI type.

Change-Id: Ifccf0e784d3fe3196e80cca238de6f8c4456e85e
 2014-08-07 16:54:51 -07:00
Jae Seo
546c635ad9 TIF: Change CEC specific names to more general ones 
Now MHL device information is also a part of HdmiDeviceInfo (previously
HdmiCecDeviceInfo). This change adjusts method/variable names across our code
base to reflect that.

Bug: 16215362
Change-Id: I7a6692329f39842a4aec9a4ff036eca5474cfd33
 2014-08-07 14:51:19 -07:00
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
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
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