Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,663 Commits 3 Branches 0 Tags
6203ec7bb3603a55887ae1329edaac713faadefc
Commit Graph

3121 Commits

Author SHA1 Message Date
Jae Seo
6203ec7bb3 am a49159c5: am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 
* commit 'a49159c53f258a62afdd6ebe1e156e907b01ced4':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
 2014-09-02 17:45:27 +00:00
Jae Seo
6036d6e8dc am 74052580: am 057043e7: am e42eaea7: Merge "TIF: Fix the Singapore content ratings" into lmp-dev 
* commit '74052580f4427c7f747aa59ee0e1d3b6c589eca3':
  TIF: Fix the Singapore content ratings
 2014-09-02 17:45:21 +00:00
Sungsoo Lim
dca9cb2436 am ff1f473c: am 9586eaa4: am d15591a7: Merge "Do not show the input icon when it\'s not available." into lmp-dev 
* commit 'ff1f473c8e87cab72ab9ea5c9fc77fbed7fd18b0':
  Do not show the input icon when it's not available.
 2014-09-02 17:45:06 +00:00
Wonsik Kim
3a0ff1302e am 49420725: am 53cb1592: am 3366cb62: Merge "TIF: add SystemApi\'s for ITvInputHardware related methods" into lmp-dev 
* commit '49420725db5c1d03758e7f34e0afea2c5e06fdd0':
  TIF: add SystemApi's for ITvInputHardware related methods
 2014-09-02 17:43:13 +00:00
Ji-Hwan Lee
49078c88a0 am 007ac9cd: am 669ad493: am 3b5096be: Merge "Add missing checks for the current session callback" into lmp-dev 
* commit '007ac9cd0053e2696cd65679389600f68a090626':
  Add missing checks for the current session callback
 2014-09-02 17:35:11 +00:00
Rachad
a588d175cd am f38342e8: am ff09c60d: am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 
* commit 'f38342e8af1533009fb5011b7c551989ba332f27':
  Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
 2014-09-02 17:34:11 +00:00
Jae Seo
0c2d782a76 am 2277a066: am 4525b6f7: am 8a8afdfa: Merge "TIF: Fix comment on TvContentRating" into lmp-dev 
* commit '2277a0661e0b600621a86c9cfa2a09d19cbceb63':
  TIF: Fix comment on TvContentRating
 2014-09-02 17:33:46 +00:00
Jae Seo
65899b1092 Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 2014-09-02 16:20:28 +00:00
Jae Seo
9e85408f12 Merge "TIF: Fix the Singapore content ratings" into lmp-dev 2014-09-02 16:20:10 +00:00
Sungsoo Lim
75f903e123 Merge "Do not show the input icon when it's not available." into lmp-dev 2014-09-02 16:16:02 +00:00
Sungsoo Lim
3633832063 Do not show the input icon when it's not available. 
Bug: 17335230
Change-Id: Icb84949ed55f22bb384df9ed4bbfe3d86949c301
 2014-09-02 09:13:43 -07:00
Jae Seo
3652e1d8b8 TIF: Fix the Singapore content ratings 
It is not that Singapore has two different rating systems. There is just one
rating system from Board of Film Censors but each broadcaster uses a different
subset of ratings. For example, Free-To-Air uses PG and PG13 while Pay TV uses
NC16 and M18 ratings in addition to the PG and PG13.

Bug: 17330613
Change-Id: I5a5e47706e7415f13a5e7dc9c00cc2c3c3763965
 2014-09-02 00:30:01 -07:00
RoboErik
5bd23653e0 am 85a4839e: am e9fbaa4e: am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 
* commit '85a4839e995fcf0aabce973c18d984badd9509d2':
  Document MediaSession.Callback.onMediaButtonEvent and add returns
 2014-09-02 07:10:57 +00:00
Andrew Jeon
52e7495055 am 3fe37375: am d06311db: am 75d95d4c: Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev 
* commit '3fe373759deaa57b902ee4fa4f0a9e2f8ef0d450':
  Replace "Comment" to "Description" since description makes more sense in the context of the java doc.
 2014-09-02 07:10:41 +00:00
Jae Seo
d6ae33bd6a TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE 
Bug: 17331873
Change-Id: Idabeb056ae2105125174d7392dbe4fae614752fc
 2014-09-01 23:49:00 -07:00
Wonsik Kim
d71c691bc5 TIF: add SystemApi's for ITvInputHardware related methods 
Bug: 17322530
Change-Id: I813d865bc9a77d1d381e52188afac5c5c75a2968
 2014-09-02 11:45:35 +09:00
Ji-Hwan Lee
774f6c3657 Add missing checks for the current session callback 
Bug: 17336320
Change-Id: I4676c4d76d1ed9d22bd476319098cbfcce52cd6d
 2014-08-30 16:11:50 +09:00
Rachad
8b63a2bf50 Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 2014-08-30 01:11:36 +00:00
Jae Seo
f7255fcc14 Merge "TIF: Fix comment on TvContentRating" into lmp-dev 2014-08-30 00:51:19 +00:00
Jae Seo
b417c9d0e2 TIF: Fix comment on TvContentRating 
Bug: 17332911
Change-Id: Ia2d76b2c6ecf6b804f8b6aa8cec78a243b70e966
 2014-08-29 16:13:07 -07:00
RoboErik
2f08888fbe Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 2014-08-29 22:39:00 +00:00
Andrew Jeon
51374011a8 Replace "Comment" to "Description" since description makes more sense in 
the context of the java doc.

Change-Id: Id7c2bb76d792680eb6d674cd01290272de723b92
 2014-08-29 14:26:53 -07:00
RoboErik
cd74270da7 Document MediaSession.Callback.onMediaButtonEvent and add returns 
Documents the return value and makes sure it returns true where
appropriate.

bug:17289717
Change-Id: Ia831a7212b76e8434b745be70da2ed106fa01230
 2014-08-29 14:17:13 -07:00
Dongwon Kang
52605792e2 am 02a24fa1: am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '02a24fa16e819d3cf75d7b4b93ee09354a7a253e':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 04:20:33 +00:00
Rachad
c38f9ba81c Tunneled Video Playback: 
Fixed missing AudioHwSync for provided Audio session ID

Bug: 17112525
Change-Id: I89509ada88462d4db7fc37007e0ffaea153da5cd
 2014-08-28 19:02:20 -07:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE. 
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
 2014-08-29 08:58:30 +09:00
Jean-Michel Trivi
12542f1757 am b49dfbef: am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'b49dfbef478aeaf1f88056fe14a85970a9580f2d':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 23:08:36 +00:00
Jean-Michel Trivi
53f5106d9d am c7e083a5: am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 
* commit 'c7e083a5b83804737fc5d006853d93a3e44c760e':
  More AudioManager.generateAudioSessionId() javadoc
 2014-08-28 23:08:31 +00:00
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 23:08:20 +00:00
RoboErik
674f89837b am 3b273101: am c4f63258: am b907b22f: Merge "Set/unset session on the callback" into lmp-dev 
* commit '3b2731011149b9688c181de048651345db446406':
  Set/unset session on the callback
 2014-08-28 22:58:52 +00:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback 
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
 2014-08-28 14:19:25 -07:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback 
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
 2014-08-28 21:11:22 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:10:38 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
John Spurlock
1bb69d0688 am f1e0b838: am dcd367d2: am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev 
* commit 'f1e0b838cefefe48130b2aa3e4461a37ea55b6a7':
  Enhance audio service dumpsys.
 2014-08-28 17:22:21 +00:00
John Spurlock
2b29bc4c1c Enhance audio service dumpsys. 
- Add device name for keys
 - Add max volume for streams
 - Add missing stream name constant

Bug:16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
 2014-08-28 12:20:05 -04:00
Lajos Molnar
c5f688bb3f am 0b307ba1: am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 
* commit '0b307ba11f5a6aaf3ab16f0c4bcdcc55106b786d':
  media: update MediaCodec/Info/List/Format APIs based on review comments
 2014-08-28 14:01:46 +00:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Eric Laurent
e71ab3bef9 am 648e593b: am 02d9054a: am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit '648e593be4855b7303b26532b5680ef02afb02f8':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 22:25:00 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments 
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
 2014-08-27 14:40:02 -07:00
Jean-Michel Trivi
84e18ecd4b android.media.Ringtone: add getter for AudioAttributes 
Bug 17290606

Change-Id: I28406080cc1fb6a916b2859d0ef39980464953e9
 2014-08-27 14:32:17 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates. 
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
 2014-08-27 16:25:00 -04:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent 
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
 2014-08-27 12:36:33 -07:00