Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,529 Commits 3 Branches 0 Tags
256fda44930105d124d2bd428b30cf644f95426f
Commit Graph

3037 Commits

Author SHA1 Message Date
Jae Seo
256fda4493 am 941070ce: am 5a58383a: am 48ca66c3: Merge "TIF: Fix comments in TvContentRating" into lmp-dev 
* commit '941070ce591ec3de08f9d2675a41a1bb50b6212e':
  TIF: Fix comments in TvContentRating
 2014-08-22 19:07:52 +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
94573f25c7 am fcf625c5: am ef396f9e: am deeb5e37: Merge "Send notification messages immediatelly" into lmp-dev 
* commit 'fcf625c530c95fd64f93d195197590da24a5a79b':
  Send notification messages immediatelly
 2014-08-22 16:24:40 +00: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
830964636e am 2f5d9946: am dec5e4be: am b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 
* commit '2f5d9946587b1012fdf5a865846512a0036cda36':
  MediaCodec: expand documentation on flush/EOS handling and adaptive playback
 2014-08-21 23:30:12 +00: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
14b032f71b am 45ed03a4: am 6ec862ea: am 60eb4e9c: Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 
* commit '45ed03a47798d6c9fa88006f4265b26ce02254d7':
  MediaHTTPConnection: handles cross protocol redirects.
 2014-08-21 22:55:20 +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
23919a0844 am 22df3962: am c1555a32: am 36f8f711: Merge "Always set transport control flags" into lmp-dev 
* commit '22df39623bfe76b1c1af60cecdfcbca76af9ecd2':
  Always set transport control flags
 2014-08-21 19:22:50 +00: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
5798f2cc59 am c48ac07f: am 030b3b29: am 90863124: Merge "Set transport control flags when a session is created" into lmp-dev 
* commit 'c48ac07f67a8ed3627a7c950e0a4084c4f06971e':
  Set transport control flags when a session is created
 2014-08-21 17:27:08 +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
c8600f9f12 am fc2dccca: am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit 'fc2dcccab58adf2fb6a750e499cec42180806cb2':
  TIF: Accept any character for custom label.
 2014-08-21 16:47:57 +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
ff4034063f am f2ce5855: am ed360234: am 155bf68b: TIF: Release main TvView on reset() 
* commit 'f2ce58554944ac425374099eaaf07f26a8296425':
  TIF: Release main TvView on reset()
 2014-08-21 13:39:46 +00: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
f06b40e8b5 am 128b1a8d: am 797eeba5: am 9c179483: API Review: android.media.tv 
* commit '128b1a8df3621158eac0737baadc6fe388b98a23':
  API Review: android.media.tv
 2014-08-21 05:16:12 +00:00
Jeff Brown
e47d874d44 am 94b31e2e: am 6562f2ce: am 2bc60f6e: Only select bluetooth route by default when A2DP is enabled. 
* commit '94b31e2e2d887e42bd6db904bd68c87017788d44':
  Only select bluetooth route by default when A2DP is enabled.
 2014-08-21 04:07:49 +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
RoboErik
6b171b36f8 am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev 
* commit '666360cbe70a3c482b16a0fd438a3f10d0fcf643':
  Api updates to MediaSession components
 2014-08-21 00:57:08 +00: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
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
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE) 
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
 2014-08-19 20:08:52 -07: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