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

3142 Commits

Author SHA1 Message Date
RoboErik
b2f57cfd04 am a241a83d: am 720c772a: am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* commit 'a241a83d18530d3bb9010a36f8cc89e50ad20c7b':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 13:49:21 +00:00
Jungshik Jang
d6aefa5515 am 8271173e: am 4a948322: am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev 
* commit '8271173e44340d4c67044c60cf908dba56fab8e8':
  Make stream_music volume configurable.
 2014-09-03 09:14:03 +00:00
Jean-Michel Trivi
6ae6b11e51 am f2bdd3fc: am 22a14cd2: am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev 
* commit 'f2bdd3fcbbfade395c0a7de19f63a79e2e590f72':
  Restore permission check for mic muting
 2014-09-03 05:03:35 +00:00
RoboErik
42f0a36ece Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* changes:
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 00:26:10 +00:00
RoboErik
f2133474af Update MediaController comment to mention notification listeners 
Forgot to update the comment to specify that notification listeners
may also get a MediaController from the manager.

Change-Id: Id38bcf7cb38185bfe4f99bcf8889a6415320dd36
 2014-09-02 17:22:08 -07:00
Jungshik Jang
e8f8bc0ad6 Merge "Make stream_music volume configurable." into lmp-dev 2014-09-02 23:20:32 +00:00
Jean-Michel Trivi
859f4f7272 Merge "Restore permission check for mic muting" into lmp-dev 2014-09-02 20:23:00 +00:00
Michael Wright
2993c30a33 am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit 'ac0f5a4616dab78a4216d826219379a663cc1139':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:36:06 +00:00
Jean-Michel Trivi
b129930398 am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit 'dbb723022367174662a49aa4080286d454e2e0e4':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:36:01 +00:00
Ronghua Wu
98f883f8de am 50ac3f3c: am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit '50ac3f3c994e9a825f6f84445ce44ce8b4451c20':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 18:02:52 +00:00
RoboErik
5652066479 am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit '5728c18ac5a248bab36f7fefbf89c12ec0284fbb':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:57:16 +00:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
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
Jean-Michel Trivi
4a4fea0752 Restore permission check for mic muting 
The implementation for AudioManager.setMicrophoneMute() used to
 call directly into AudioSystem which called directly into
 AudioFlinger and the mediaserver process, where the check for
 the MODIFY_AUDIO_SETTINGS is performed.
A regression was introduced by Ib32138bcc256cfbac4fe21a090d5ba34f5c641fc
 which calls first into AudioService which runs in system_process
 before calling into AudioSystem, which granted the permission.
This CL adds a permission check in this code path when calling
 AudioService.

Bug 17259652

Change-Id: I4ac5269262eb90df80ee81db6ec3d96977ee53be
 2014-09-02 10:38:27 -07: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
Ronghua Wu
a7118c9bb2 Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 2014-09-02 17:27:26 +00:00
RoboErik
17a1b48629 Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 2014-09-02 16:58:30 +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
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback 
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
 2014-09-01 23:49:57 -07: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
Jungshik Jang
32069a1292 Make stream_music volume configurable. 
AV devices including TV have more fine-grained volume control
for media type (audio and video). But audio service allows
only 15 steps for music type.
This change mimics voice calls approach to make music type
volume configurable.

Bug: 17342612
Change-Id: Ic82ff4d74b29963edfe92975000df07244492ae6
 2014-09-01 17:51:08 +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
Jean-Michel Trivi
c5258433dd Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager 
For ACTION_HEADSET_PLUG (already in SDK):
 - duplicated definition in AudioManager and moved
  javadoc there. Javadoc in Intent points to AudioManager.
 - the String value is not changed

For ACTION_HDMI_AUDIO_PLUG (being added in SDK):
 - moved defintion from Intent to AudioManager
 - updated String value to reflect package name "android.media"
  instead of using "android.intent"
 - added definition of the extras, but removed "name".

For ACTION_ANALOG_AUDIO_DOCK_PLUG,
    ACTION_DIGITAL_AUDIO_DOCK_PLUG,
    ACTION_USB_AUDIO_ACCESSORY_PLUG,
    ACTION_USB_AUDIO_DEVICE_PLUG, all hidden:
 - moved definition from Intent to AudioManager,
 - changed the value from "android.intent.*" to "android.media.*"

Updated AudioService, UsbDeviceManager and UsbHostManager
 to refer to the actions in AudioManager, not Intent.

Bug 17289385

Change-Id: I61dd73140022d2bb9a676a57f595092c8fa89dcc
 2014-08-29 17:29:27 -07: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
RoboErik
c692d05951 Update MediaBrowser to use String ids instead of Uris 
Since we converted MediaDescription over to using a String media id
for identifying everything we should also use Strings in the browser
service to make it clear that it should re-use that field.

bug:17333205
Change-Id: I5fd5762bdad05068f5b1aa36074306b43432e686
 2014-08-29 15:16:19 -07: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