8392 Commits

Author SHA1 Message Date
Ronghua Wu
5b9305fe9b MediaHTTPConnection: handles cross protocol redirects.
Bug: 16899444
Bug: 17106630

Change-Id: I7e416447abffcae31c65fd469ee5f9fc867b4cdc
2014-08-21 13:42:00 -07:00
RoboErik
6c30ff976d Always set transport control flags
In case we're attaching to a pre-existing session with non-zero flags.

bug:16822064
Change-Id: Ibd5cc8e00de59f1fe30fc3d0e64741aaf9f4746f
2014-08-21 17:52:31 +00:00
RoboErik
69b131339b Merge "Set transport control flags when a session is created" into lmp-dev 2014-08-21 16:58:42 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label.
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
2014-08-22 01:05:40 +09:00
Ji-Hwan Lee
c7f440dcd8 TIF: Release main TvView on reset()
Also, use WeakReference for TvView.sMainTvView.

Change-Id: I6eec1c9f907692f0fbfa96d80c7d1141eabde6e2
2014-08-21 12:11:50 +00:00
Jae Seo
14355950d5 API Review: android.media.tv
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
2014-08-20 20:59:51 -07:00
RoboErik
93b4662531 Set transport control flags when a session is created
Some apps only set the transport control flags once when their service
starts. This was leading to them not getting set when a session is
created on their behalf in RCC. This sets the flags when a session
is created if needed.

bug:16822064
Change-Id: Iea1ebf7747b3059101eb3c36b143b594cc51e114
2014-08-20 18:19:30 -07:00
Lajos Molnar
479cc54307 MediaCodec: expand documentation on flush/EOS handling and adaptive playback
Bug: 11216198
Change-Id: I929954ec381511b9b97e53a91ff6fdff75ca1382
2014-08-20 15:13:56 -07:00
Jeff Brown
f1b2335a36 Only select bluetooth route by default when A2DP is enabled.
Bug: 15756471
Change-Id: I822e51742e009b473000b8d67ec9c9a81c39b702
2014-08-20 14:45:38 -07:00
RoboErik
d2b8c947dd Api updates to MediaSession components
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo

bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE)
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2014-08-19 20:08:52 -07:00
Jae Seo
3acf66f558 Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 2014-08-19 21:23:09 +00:00
Jae Seo
47b9e4afc9 TIF: Add the video frame rate information to TvTrackInfo
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
2014-08-19 12:02:16 -07:00
Jae Seo
1553a528a5 API Review: android.media.tv
TvView:
- Instead of ERROR_INPUT_DISCONNECTED, a separate callback
  onDisconnected; change onError to onConnectionFailed.

Bug: 17114406
Change-Id: I9457ac81c883610f96954494bf75a4e78e53383f
2014-08-19 22:20:22 +00:00
Lajos Molnar
d504ab14d2 media.MediaPlayer: don't check file-existence for URI-s with scheme
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).

Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
2014-08-19 11:08:08 -07:00
RoboErik
a66c40bf6e Update MediaSession APIs for council feedback
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
2014-08-19 17:12:42 +00:00
Ji-Hwan Lee
15c56aac98 TIF: Call setMain(false) when session is released.
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
2014-08-19 06:11:04 +00:00
Jaewan Kim
67d666f604 Merge "Fix NPE when passing null TvContentRating" into lmp-dev 2014-08-16 04:12:14 +00:00
Jaewan Kim
a42be3c950 Fix NPE when passing null TvContentRating
Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
2014-08-19 11:55:07 +09:00
Dongwon Kang
79fc32794c Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 2014-08-19 02:08:36 +00:00
Dongwon Kang
911d0827ca TIF: verify the hardware input ID from getHardwareInputId().
This will prevent an input from displaying other tuner inputs.

Change-Id: I77a6b99599eac4a9048a12e2928bc16b34d94343
2014-08-18 23:33:26 +00:00
Jae Seo
5b1caaf7d8 TIF: Fix some comment warnings
Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
2014-08-18 23:25:48 +00:00
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
d86ecd26d7 Add callbacks for MediaProjection start / stop.
Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
2014-08-17 16:06:56 -07:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
2014-08-16 04:52:56 +00:00
Andy Hung
2aaed141fa Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 2014-08-16 04:32:18 +00:00
Andy Hung
70b395e8c1 Fix 48kHz limitation on AudioTrack
Changed to 96kHz.

Bug: 12979141
Bug: 17069369
Change-Id: I7643901f6d365d8b46da4872bd2266ec20cb0339
2014-08-18 11:25:22 -07:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
2014-08-17 17:59:22 -07:00
Andy Hung
efb3a8b37a Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev 2014-08-15 21:23:40 +00:00
Andy Hung
ad720aeea7 Fix 7.1 audio playback from AudioTrack
Uses AudioFormat.CHANNEL_OUT_7POINT1_SURROUND.

Bug: 16951383
Change-Id: I7e94598d5cae1a741b8b1e0492b202163bf9f9fd
2014-08-15 14:23:06 -07:00
Lajos Molnar
be5e3359b1 Merge "media: minor fixes for MediaCodecInfo" into lmp-dev 2014-08-15 19:14:43 +00:00
Lajos Molnar
981c344ee7 media: minor fixes for MediaCodecInfo
- use equals() for Range singularity checks
- parse max-channel-count properly
- add platform defaults to G711 and GSM audio codecs
- allow xml to override platform limits if format,
  profile or level is not supported (but recognized to be
  possibly valid) by the platform
- set defaut format fields

Bug: 11990470
Change-Id: I06114e2d10dcc205a8a963605a01e6d4f6ecd0f0
2014-08-15 17:35:30 -07:00
RoboErik
78c64cdbd8 Fix crash in legacy apps that register without a looper
Some legacy apps registered their media button receiver in a thread
without a looper. If this happens we need to use the main looper to
prevent a crash.

bug: 16306226
Change-Id: Idf472e649393e2a7ce2a3e1cbb3476003ab17f34
2014-08-14 18:42:54 -07:00
Jinsuk Kim
8960d1b155 CEC: Replace the usage of logical address with id for HdmiDeviceInfo
Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
2014-08-14 10:52:23 +09:00
RoboErik
1d2a1c917f Merge "Pipe caller's identity through volume methods" into lmp-dev 2014-08-13 01:30:58 +00:00
RoboErik
0dac35af2c Pipe caller's identity through volume methods
setStreamVolume and adjustStreamVolume were always being called
from the session service's uid/package. This adds the plumbing to
allow the original app's info to be passed in to the audio service
when volume is changed.

Change-Id: Ib36639dab1e518b435161dc453c8ba9351df3e9b
2014-08-14 10:21:26 -07:00
Jae Seo
e8deca1a0e Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 2014-08-13 01:30:58 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
2014-08-14 17:28:07 +00:00
RoboErik
5ca4a78e32 Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev 2014-08-14 16:46:52 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
Lajos Molnar
eed01e068b Merge "media: release allocated strings on error" into lmp-dev 2014-08-13 16:52:03 +00:00
Dongwon Kang
d4eb10a88d TIF: resolve SecurityException on loadCustomLabel().
Bug: 17001118
Change-Id: I357ac2506562c028116c3e4f6dd611ef2b744d28
2014-08-14 03:43:07 +00:00
Sungsoo Lim
1d11640127 Update Java doc for TV Rating system
Bug: 17007100
Change-Id: Idb3f2184ea6d0421875ccd1e10b7539b3c17080a
2014-08-14 12:24:41 +09:00
Jaewan Kim
e2c83c97fb TIF: Change data type of custom labels and hide inputs
Change-Id: I2783245671a2a2a5500c6f97acf6375f44db8bf4
2014-08-14 01:12:41 +00:00
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
2014-08-13 13:31:04 -07:00
Chulwoo Lee
81d1b4def0 TIF: Enable to build uri for browsableOnly channels
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
2014-08-13 12:28:34 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Sungsoo Lim
a9a29a29e5 Fix hashCode of TvContentRating
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
2014-08-13 08:32:29 +00:00