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

8415 Commits

Author SHA1 Message Date
Jae Seo
d824acc263 am aef26a7a: am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit 'aef26a7a3116649801600b6aca80039b200aa4c2':
  TIF: Make TV content rating names consistent
 2014-08-26 21:02:57 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Ji-Hwan Lee
8e5529326e am 81d8f52d: am 24e0e863: am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '81d8f52d974e7289563bfe9245f24536bee9d0a4':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:39:53 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call 
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
 2014-08-27 02:55:10 +09:00
Jae Seo
b2835e2700 TIF: Make TV content rating names consistent 
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
 2014-08-26 10:08:56 -07:00
Youngsang Cho
9068981ae1 am e5c88c85: am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'e5c88c859eaf735cdfb2c1ffedae62db12219fc0':
  Reset a session callback variable when tune is failed
 2014-08-26 15:06:11 +00:00
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
ff7073e582 am a5b65fff: am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit 'a5b65fffe5433b2df884ffd767d2696e06445fbb':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:26:07 +00: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
f06bc89505 am 35a04acd: am 8e602688: am 748bbc04: Merge "Fix checking trackId" into lmp-dev 
* commit '35a04acd2bc580469540af09a8824123cd51e528':
  Fix checking trackId
 2014-08-26 10:10:06 +00:00
Dongwon Kang
38624e50af am 5a3ba1c5: am 8853b9f2: am 0628fbf6: Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 
* commit '5a3ba1c5d04a409cd834081b4ed0faa157f97bb0':
  TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
 2014-08-26 10:09:41 +00:00
John Spurlock
f8200201cc am 0ae6ee5c: am f6a07ca1: am a60bba8d: Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 
* commit '0ae6ee5cd214b8211a8c6a2cc06fa41c0487d62e':
  QS: Wire up screen casting to tile/panel.
 2014-08-26 10:09:07 +00:00
Nancy Chen
d7b43eae63 am ff0847ce: am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 
* commit 'ff0847ced3191ba019b41524855646335d717f62':
  API review PhoneManager -> TelecommManager. Rename methods (6/6)
 2014-08-26 10:09:02 +00:00
RoboErik
0930127614 am dba279ee: am e9b37d06: am 936b1894: Merge "Ensure current volume is current" into lmp-dev 
* commit 'dba279ee1e5ae7a90e8f0693ce929d7ef8bd25ca':
  Ensure current volume is current
 2014-08-26 10:08:14 +00: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
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
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
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