8439 Commits

Author SHA1 Message Date
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
Jean-Michel Trivi
3512bcd3af Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 2014-09-05 18:00:51 +00:00
Jean-Michel Trivi
ccd654e9d4 Permission check for entering MODE_IN_CALL
Make the ability to change the audio mode conditional to having
 the MODIFY_PHONE_STATE permission.
Make AudioService's internal implementation of the mode setting
 (the setModeInt() method) private, it is only meant to be used
 by AudioService.
Refer to the permission names through Manifest.permission, not
 by their string value.

Bug 14964198

Change-Id: I49870207566e53d5c8764646cece06d8272f93ed
2014-09-05 09:50:54 -07:00
RoboErik
92e565f715 rename SERVICE_ACTION to SERVICE_INTERFACE
For API consistency this intent is suppose to be named SERVICE_INTERFACE.

bug:17390782
Change-Id: I4c3b1d8476dd6c939792f73615e92d7bfa6d5758
2014-09-04 14:06:34 -07:00
RoboErik
a4b9a191a8 Merge "Ensure there's a valid handler when registering a sessions listener" into lmp-dev 2014-09-04 20:52:56 +00:00
Eric Laurent
b6efa23adc Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 2014-09-04 20:47:44 +00:00
RoboErik
f85a08d30f Merge "Update VolumeProvider apis per feedback" into lmp-dev 2014-09-04 17:38:01 +00:00
Eric Laurent
5a7e9207f0 AudioManager: only use main looper for AudioPort event handler
Bug: 17336373.
Change-Id: I0a9a7012778f99acbf027ec2928ca222954ad0bd
2014-09-03 19:11:39 -07:00
RoboErik
8e1e84847e Ensure there's a valid handler when registering a sessions listener
Some legacy apps register a RemoteController on a thread without a
looper. This ensures a handler with a looper is used when it registers
the sessions listener.

bug:17357029
Change-Id: Ia3d98f5dcc331edd0c3a7e858db1d9e7e2749e14
2014-09-03 18:25:15 -07:00
Jae Seo
a90ae8bebb Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 2014-09-04 01:23:35 +00:00
Jae Seo
0a514c0a87 TIF: Add Quebec ratings for Canada and fix the XML example
Bug: 17332911, Bug: 17321648
Change-Id: Ice884ecdeda246e978ab235913e3e92d0c1e6ec2
2014-09-03 16:42:39 -07:00
Jungshik Jang
9ed982d42d Rename ro.config.music_vol_steps into ro.config.media_vol_steps.
Bug: 17342612
Change-Id: I77b08a606d26e3d3fd909e28c5ecb9898d214be0
2014-09-04 08:36:21 +09:00
RoboErik
0d0f67f5ee Update VolumeProvider apis per feedback
Added currentVolume to constructor.
Removed onGetCurrentVolume and notifyVolume changed.
Added setCurrentVolume and getCurrentVolume.
Updated javadoc to make it clear how they're used.

bug:17258168
Change-Id: I24388aab38824b101ccc18810caa09d46aa7afe0
2014-09-03 16:29:15 -07:00
Glenn Kasten
49367a367c Merge "Fix regression in CTS for AudioTrack" into lmp-dev 2014-09-03 18:31:59 +00:00
Youngsang Cho
9df2c1be32 Add a warning log when it takes long time to handle a message in TIS
Bug: 17291092
Change-Id: If14ff467ac81d4f8d33febd57dd414dc5f4d3558
2014-09-03 23:18:20 +09:00
RoboErik
bcd20f850c Merge "Allow empty strings in playFromSearch" into lmp-dev 2014-09-03 00:40:21 +00:00
RoboErik
4b253d2bcd Allow empty strings in playFromSearch
This allows empty strings to be passed to playFromSearch to indicate
something should be chosen for the user and played. This makes it
consistent with INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH.

bug:17316566
Change-Id: I00ce8d252efa940e05568629e35198450c224a92
2014-09-02 17:39:46 -07: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
Glenn Kasten
c56b808591 Fix regression in CTS for AudioTrack
Bug: 17160316
Change-Id: Id1828f6684cdd410ee315c8b313d64785d786e1d
2014-09-02 11:48:27 -07: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
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
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
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
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
Jeff Tinker
67085e1cac Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 2014-08-29 01:45:25 +00: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
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