drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,763 Commits 1 Branch 0 Tags
Commit Graph

8390 Commits

Author SHA1 Message Date
Wonsik Kim
2a54a3adea am a7090255: am 44505361: am 0d86a94f: Merge "TIF: define hidden channels columns as @SystemApi" into lmp-dev 
* commit 'a70902550ec0b0e3120632087e68189172c385d1':
  TIF: define hidden channels columns as @SystemApi
 2014-08-25 08:25:40 +00:00
Wonsik Kim
8d0b268e42 TIF: define hidden channels columns as @SystemApi 
Bug: 17165479
Change-Id: Ic0b0bdbc440eb15e68e4a1a5fa15a4875b17d061
 2014-08-25 14:21:40 +09:00
Lajos Molnar
f7ac0226b0 am 5a7f49f7: am a66ef2be: am 202c366e: Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 
* commit '5a7f49f715b25c8f6a961dc04768ce1fa10e9899':
  MediaCodeInfo: fix support for feature-can-swap-width-height
 2014-08-22 20:08:36 +00: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
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
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
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
2516fb5d14 am 8a98d4b5: am 2377dbed: am d2366e55: Merge "TIF: Add the video frame rate information to TvTrackInfo" into lmp-dev 
* commit '8a98d4b5aac0eda2c3728b8f1eb6a02d4ba0b202':
  TIF: Add the video frame rate information to TvTrackInfo
 2014-08-20 01:22:53 +00:00
Jae Seo
2ad2624339 am 3261e435: am 785c8732: am 03d07be7: API Review: android.media.tv 
* commit '3261e43519caeaf94bbab959f381013854c127c4':
  API Review: android.media.tv
 2014-08-19 22:45:54 +00: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
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
Lajos Molnar
7639f78aee am d1edc10f: am 321d7e4f: am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme 
* commit 'd1edc10fd69dd9c2f759aaa074472c39af6a2812':
  media.MediaPlayer: don't check file-existence for URI-s with scheme
 2014-08-19 18:37:27 +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
a1f64b6eb5 am c6c011af: am eb81b54a: am 368325e4: Update MediaSession APIs for council feedback 
* commit 'c6c011afb4867fadbc1f556c73e4bdfcf6929c4c':
  Update MediaSession APIs for council feedback
 2014-08-19 17:43:25 +00: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
e84bf72356 am 9de91850: am 2c315fef: am 1becc968: TIF: Call setMain(false) when session is released. 
* commit '9de91850dc48e4a65749bda2c9f511e0876a56b0':
  TIF: Call setMain(false) when session is released.
 2014-08-19 07:23:13 +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
8ff0b660cf am eab08670: am 8e04501a: am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit 'eab086704039d69aeddf6f65571932c9b2002e7f':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:26:00 +00:00
Dongwon Kang
9b90ec1e31 am 2b2ef62e: am ad741c97: am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 
* commit '2b2ef62eb5bdc52793d7b6709cc8a744b30c2439':
  TIF: verify the hardware input ID from getHardwareInputId().
 2014-08-19 04:37:47 +00:00
Dongwon Kang
79fc32794c Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 2014-08-19 02:08:36 +00:00
Michael Wright
198ca696fb am 7814d9f0: am 4bbb811f: am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 
* commit '7814d9f05d202625280210269c89655013dce3de':
  Add callbacks for MediaProjection start / stop.
 2014-08-19 00:48:21 +00:00
Jae Seo
4f49c2ca9b am 6b8c8993: am d90db994: am d733a820: TIF: Fix some comment warnings 
* commit '6b8c8993f17031749ba99b9001c5dfc8cf2ebed6':
  TIF: Fix some comment warnings
 2014-08-18 23:45: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
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00