8363 Commits

Author SHA1 Message Date
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
2014-08-26 23:12:59 +09:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
2014-08-26 21:30:26 +09:00
Chulwoo Lee
984d99b584 Fix checking trackId
BUG: 17261638
Change-Id: I141b7c9de1289c49f29d2f1e1ac534045abb333d
2014-08-26 11:29:17 +09:00
Dongwon Kang
f178c14919 Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 2014-08-25 23:44:34 +00:00
Dongwon Kang
c88b8f8722 TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
Bug: 17241260
Change-Id: Ib82ed9fb98f13e31cdf70a3bb273384abcf1b33a
2014-08-26 08:41:40 +09:00
John Spurlock
d38eeb5512 Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 2014-08-25 22:35:25 +00:00
Nancy Chen
e4b1d57dfd Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 2014-08-25 22:24:09 +00:00
John Spurlock
78b8c8fbde QS: Wire up screen casting to tile/panel.
Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.

Also:
 - Implement hashCode/equals on MediaProjectionInfo
 - Fix unintentional recursion in the service.

Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
2014-08-25 17:55:08 -04:00
RoboErik
cc3e5d5cd1 Merge "Ensure current volume is current" into lmp-dev 2014-08-25 20:20:54 +00:00
Nancy Chen
0eb1e402c7 API review PhoneManager -> TelecommManager. Rename methods (6/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I7d573e27ed093f2ddb7849703cc62f9916835393
2014-08-25 10:50:44 -07:00
Wonsik Kim
8d0b268e42 TIF: define hidden channels columns as @SystemApi
Bug: 17165479
Change-Id: Ic0b0bdbc440eb15e68e4a1a5fa15a4875b17d061
2014-08-25 14:21:40 +09:00
RoboErik
7e2b3008f1 Ensure current volume is current
This sets the current volume when a session is switched over to
remote playback. Otherwise it won't be current until it changes and
sends an update.

Change-Id: Iabedb24a34e88308e7e3c56a2b1ab279a17b466b
2014-08-22 14:39:36 -07:00
Lajos Molnar
a802e26d08 Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 2014-08-22 19:38:23 +00:00
Jae Seo
ae06aec9bb Merge "TIF: Fix comments in TvContentRating" into lmp-dev 2014-08-22 18:41:32 +00:00
Jae Seo
ceb51abc74 TIF: Fix comments in TvContentRating
Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8
2014-08-22 11:27:10 -07:00
Youngsang Cho
e91f83c88e Merge "Send notification messages immediatelly" into lmp-dev 2014-08-22 15:54:12 +00:00
Youngsang Cho
9044be13dc Send notification messages immediatelly
Notification messages are posted through a handler with a main thread.
When a caller of TIS.notifyXXX runs also in a main thread, the notification
is delivered after the method including the caller is finished.
So we added runOnMainThread and made notification messages sent through
runOnMainThread.

Change-Id: Ieb2c5c04ff031e42a532acfc45e0174563265c6b
2014-08-23 00:53:31 +09:00
Lajos Molnar
6ac9da6b18 MediaCodeInfo: fix support for feature-can-swap-width-height
Also fix an issue with limiting size based on number of
blocks allowed.

Bug: 11990740
Change-Id: I3b01be4031dce6b425e8573da5de527ba2a0995c
2014-08-21 16:24:27 -07:00
Lajos Molnar
c54a76cbcd Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 2014-08-21 23:05:28 +00:00
Ronghua Wu
c90c7d257c Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 2014-08-21 22:24:16 +00:00
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