8491 Commits

Author SHA1 Message Date
Jae Seo
ee2ec05ed7 TIF: Turn debugging off
Bug: 17476383
Change-Id: I28ff54a635bf6468c231efe776dbc8e35460d542
2014-09-14 10:30:05 -07:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Jean-Michel Trivi
f47ff5bf97 Merge "more AudioAttributes javadoc" into lmp-dev 2014-09-12 23:45:23 +00:00
Jae Seo
3c8e65a307 TIF: Add a system API to retrieve HDMI device information
Bug: 17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
2014-09-12 16:17:51 -07:00
Jean-Michel Trivi
04f55a490d more AudioAttributes javadoc
Expand the AudioAttributes and associated Builder javadoc.

Bug 17059703

Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
2014-09-12 15:56:46 -07:00
Jean-Michel Trivi
873cc45da2 AudioService: modify stream delay for touch exploration
When accessibility services are running, in particular touch
 exploration, the default stream override delay in AudioService
 makes it hard for the user to change the notification volume
 as when TalkBack speaks, the user would control the media
 volume during the utterance, and up until 5s after its end.
Use a shorter delay when touch exploration is enabled.

Bug 17140435

Change-Id: Iabadb9778f2957b5aa0aebd1599f2d69bd83222b
2014-09-12 10:26:24 -07:00
Michael Wright
cde5bb45cc Change callback methods from add to register.
Also changes intent returning method from get to create. Both changes
are in response to API council feedback.

Bug: 17389882
Change-Id: I3b57e3fc202148e3bbb24ac61229f04e8b4ac41e
2014-09-11 19:37:30 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Youngsang Cho
db8f7ab752 Fix build breakage
Change-Id: Ic52e2d767f3adfedfa4e78aa2510d480c537c857
2014-09-11 11:22:07 +09:00
Terry Heo
d608f3abac Merge "Add a system API to query hdmi system audio mode" into lmp-dev 2014-09-11 01:35:07 +00:00
Chulwoo Lee
19ba61affb Notify of the update of TvInputInfo
The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
   available.
3. the media on which a newer version of TV inputs exists become
   unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
2014-09-11 10:32:00 +09:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
2014-09-10 17:58:09 -07:00
Eric Laurent
ea9aa9a282 Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev 2014-09-10 22:37:26 +00:00
Eric Laurent
4fc28d78cb AudioEffect JNI: fix queryEffects()
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.

Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
2014-09-10 15:05:03 -07:00
Jae Seo
9127e4580c TIF: Enable inflating class android.media.tv.TvView on non-TV devices
Needed to pass the CTS for those devices.

Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
2014-09-10 13:11:13 -07:00
Jean-Michel Trivi
f35423bb4e Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 2014-09-10 17:29:20 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
2014-09-10 01:33:17 +00:00
Jean-Michel Trivi
aea175e499 More android.media.AudioFormat.Builder javadoc
Bug 17059703

Change-Id: I1cca2effecbf1998dfa48774d87d94c00285c16c
2014-09-09 17:52:22 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
2014-09-09 17:27:26 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
2014-09-09 16:19:10 -07:00
Lajos Molnar
aa79d99576 initialize codec list before MediaCodec.getCodecInfo()
Bug: 17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
2014-09-09 14:35:33 -07:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Jae Seo
fe5998b5ad Add Japanese content ratings
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
2014-09-09 10:06:52 -07:00
Eric Laurent
7c36c86342 Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 2014-09-09 01:59:00 +00:00
Eric Laurent
56340fc2e8 unhide AudioAttributes flag FLAG_HW_AV_SYNC
Bug: 17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
2014-09-08 18:51:35 -07:00
Jean-Michel Trivi
b3bf7d487a Virtualizer: replace device type by virtualization mode
Define audio virtualization modes that represent the different
 audio processing modes.
Change and document the change in the methods used to describe
 the virtualizer capabilities and characteristics.
Implement internal conversion functions between virtualization
 modes and device types.

Bug 17059703

Change-Id: Ic4db211d6f51492be9088783246abb4b2866d76f
2014-09-08 15:20:01 -07:00
RoboErik
9ff7dda93e Possible fix for dead handler in Music button event sending
I'm still attempting to root cause, but this is a potential fix. I
suspect the callback is getting registerd on a looper that isn't the
main looper which is then getting killed at some point. This change
will make all legacy callbacks happen on the main looper, which should
prevent the state.

bug:17420281
Change-Id: Ia78e694b32b24398d3c09f49d12632755ef45597
2014-09-08 13:11:55 -07:00
Jason Monk
0c37ba3188 Add user-specific playSoundEffect and use in NavBar
Add a hidden version of playSoundEffect that takes a userId to
get the correct setting as to whether sound effects should play
or not.

Bug: 15106706
Change-Id: I5c0b74081fd00732a43fe42a76d33d05197333d0
2014-09-08 15:34:23 -04:00
Jae Seo
d254611778 TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable
TV input services are now required to call these methods to
unblock/block the screen.

Bug: 17364845
Change-Id: Ifb435900d7f61785198dba2e255a2d24dbf44dc6
2014-09-07 13:39:17 -07:00
Eric Laurent
6a8eeda65f Hide AudioDevice class
AudioDevice class is only used by Virtualizer so
far so it does not need to be public yet.
Also removed redundant DEVICE_ prefix to device
types.

Bug: 17059703.
Change-Id: I5c93f66487b35de24f28641141f8e7de9e85c6c2
2014-09-07 11:15:59 -07:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00
Jean-Michel Trivi
2caa0a6070 Merge "AudioAttributes: unhide CREATOR" into lmp-dev 2014-09-05 23:36:44 +00:00
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Lajos Molnar
b860155de1 Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 2014-09-05 23:08:25 +00:00
Jean-Michel Trivi
deddda5d62 Respect Android conventions in AudioManager extras
Update the value of the extras in android.media.AudioManager
  used in ACTION_HDMI_AUDIO_PLUG to respect the Android
  naming conventions.

Bug 17390818

Change-Id: Ied1830e0ffa3b1fa7235d0675f36f2f43aac554d
2014-09-05 15:55:32 -07:00
Jean-Michel Trivi
8aacb2e96c AudioAttributes: unhide CREATOR
android.media.AudioAttributes implements the Parcelable interface,
 and is part of the SDK, it therefore requires CREATOR, writeToParcel,
 and describeContents to be "unhidden".
CREATOR was still @hide

Bug 17390818

Change-Id: I9c1cb1d454fe538cb5be6066ebed290a99352da9
2014-09-05 22:30:36 +00:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Jae Seo
2778f5a7bd API review: android.media.tv
TvInputInfo
- Renamed getIntentForSettingsActivity to createSettingsIntent.
- Renamed getIntentForSetupActivity to createSetupIntent.
- Changed the value of EXTRA_INPUT_ID from inputId to
  android.media.tv.extra.INPUT_ID.
- Removed @hiden from CREATOR.

TvInputManager
- Renamed TvInputListener to TvInputCallback.
- Renamed registerListener to registerCallback.
- Renamed unregisterListener to unregisterCallback.
- Changed the value of ACTION_BLOCKED_RATINGS_CHANGED from
  android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED
  to android.media.tv.action.BLOCKED_RATINGS_CHANGED.
- Changed the value of ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED from
  android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED
  to android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED.
- Changed the value of ACTION_QUERY_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS
  to android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS.
- Changed the value of META_DATA_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS
  to android.media.tv.metadata.CONTENT_RATING_SYSTEMS.

TvView
- Renamed TvInputListener to TvInputCallback.
- Renamed setTvInputListener to setCallback.

Bug: 17389538
Change-Id: I3dceee3db67862d77b183aef0da4fd3a8681ab1b
2014-09-05 13:43:27 -07:00
RoboErik
77a634503f Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 2014-09-05 19:49:56 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
RoboErik
272e161c1a send volume button events to adjustSuggestedStream instead of adjustStream
This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
2014-09-05 12:37:39 -07:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
2014-09-05 11:40:33 -07:00
Jean-Michel Trivi
3512bcd3af Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 2014-09-05 18:00:51 +00:00