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

143754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ji-Hwan Lee
abca0ee794 TIF: Handle null main session 
Change-Id: I5d9007e706d2adf4b559839c1db31221527214ec
 2014-07-24 17:51:25 +09:00
Sungsoo Lim
059e4f6daa Fix typo 
Change-Id: Ied87356fae0fff1bc5a0c80223351423a81ea0ce
 2014-07-24 17:16:59 +09:00
Ji-Hwan Lee
982abe693f TIF: Fix crash on setMainSession 
Change-Id: Iddf5032a99dbf855e418448b39ba66a68be8b07c
 2014-07-24 17:11:03 +09:00
Ji-Hwan Lee
4c52697dbe TIF: Support HDMI-CEC active source management 
Add system API TvView.setMain() and TvInputService.onSetMain().

Bug: 15994065
Change-Id: I60ac24659453ca616380993c4accd8c17e714639
 2014-07-24 15:07:43 +09:00
Terry Heo
a8177c8879 Merge "TIF: Enable capturing TV input of TvInputPassthroughWrapperService" into lmp-dev 2014-07-23 19:35:21 +00:00
Terry Heo
79124a717c TIF: Enable capturing TV input of TvInputPassthroughWrapperService 
Also fixed usage of Log.e() in TvInputService to show stack trace.

Bug: 16441553
Change-Id: I5c160de4a628698907ffd00510d982d597c0ea01
 2014-07-24 10:51:23 +09:00
Neil Fuller
4c3ae42756 Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev 2014-07-23 19:33:16 +00:00
Neil Fuller
3b852e3489 Rewriting android.text.format.Time without the native _tz functions 
(cherry picked from commit d7f0849b8c053ccc6abf0dc7d5bc07da502782a4)
Bug: 15765976

Change-Id: I00f72bd1043ef20f22d25559206b2f741334ba9c
 2014-07-24 11:37:20 +01:00
Ji-Hwan Lee
55c8d8ab94 Merge "TIF: Fix crash on setMainSession" into lmp-dev 2014-07-23 19:27:50 +00:00
Alan Viverette
35efc633d0 Merge "Revert "Make lighting style and attribute public"" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
4c31decf17 Revert "Make lighting style and attribute public" 
We're moving some things around. Stay tuned!

This reverts commit fe16224456b72966515190e19f8f85793a39d1c9.

Change-Id: I13a2013854cba64540dfee5c3e4ecb4929c336b5
 2014-07-24 01:43:51 +00:00
Alan Viverette
ad7e715f8b Make lighting style and attribute public 
BUG: 15859361
Change-Id: I8a12b820687c546d7441a06161da5928b2ac52fb
 2014-07-23 17:31:00 -07:00
Jungshik Jang
26c9594d95 Merge "Add @hide and @SystemApi to HdmiTimerRecordSources" into lmp-dev 2014-07-23 19:27:45 +00:00
Jungshik Jang
f3fa471d96 Add @hide and @SystemApi to HdmiTimerRecordSources 
Change-Id: I3938b26af4ca2fe8d70224bd7bac30ba627d6d44
 2014-07-24 09:56:28 +09:00
Joe Onorato
77bfc8f228 s/MediaBrowseService/MediaBrowserService/ 
Change-Id: Ie07308739cdf94796a900e15527616608e02a3d4
 2014-07-24 00:45:56 +00:00
ram
e647099e14 IMS: getPCSCF() API enhanced to support multiple APN types. 
Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>
 2014-07-24 00:41:00 +00:00
vandwalle
e32bef58f9 Merge "autojoin fixes:" into lmp-dev 2014-07-23 22:56:04 +00:00
vandwalle
154b2cf6bb autojoin fixes: 
- make use of network scorer for autojoin
- Bug:16484607

Change-Id: Ib26cfe31aa5646facf781a2345981e06a6fc36e3
 2014-07-23 18:11:26 -07:00
Terry Heo
9cc6b964fa Merge "Add a frame capture API of TV input" into lmp-dev 2014-07-23 19:27:45 +00:00
Terry Heo
c086a3df3b Add a frame capture API of TV input 
- Added new permission CAPTURE_TV_INPUT

Bug: 15736756
Change-Id: I2ae8b2e3f5b1ad1d525854ed89ab2043cf66acbe
 2014-07-24 10:08:45 +09:00
Joe Onorato
69b078599b Allow apps to be slow at loading children and thumbnails by making those functions allowed to be asynchronous. 
Change-Id: Ibcaee3f0f8d9ba14f1b002df9c6d4594c6278045
 2014-07-23 17:56:57 -07:00
Svetoslav
ab83abc35d Merge "Handle wrong file format when printing." into lmp-dev 2014-07-23 18:56:15 +00:00
Svetoslav
5ef522bc19 Handle wrong file format when printing. 
PDF is the only format suppored for printing but a buggy app
can write content in another format which was crashing the
print spooler. Now we are generating an error instead of
crashing.

bug:16487161

Change-Id: Ic59d2ac6d57213f4e8f364659d8dc7df2140e61d
 2014-07-24 03:18:47 +00:00
Antoine Labour
7699651ec4 Merge "WindowManager: fix clipping" into lmp-dev 2014-07-23 18:56:15 +00:00
Antoine Labour
7db8687d57 WindowManager: fix clipping 
The animation code has some logic to avoid committing a new clip rect
when it hasn't changed. However, when we destroy the SurfaceControl and
recreate it later, we failed to reset the cached value, so if the clip
rect hasn't changed, we never set it on the new SurfaceControl.

This patch resets the cached value when creating the SurfaceControl.

Change-Id: I355576709834dd80994c7564330a234b182800e6
 2014-07-23 21:15:48 -07:00
Sandeep Siddhartha
9d9ef2e791 Merge "searchKeyphrase* should not be in the SDK" into lmp-dev 2014-07-23 18:56:15 +00:00
Sandeep Siddhartha
392981e172 searchKeyphrase* should not be in the SDK 
Bug: 16400889
Change-Id: Idedaefe378e330910301a8f0a88527376398d743
 2014-07-23 15:16:10 -07:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation 
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
 2014-07-23 19:14:10 +00:00
Craig Mautner
0b633fc121 Disable back button goes to recents behavior 
Using a static final boolean to do this so if policy is changed it
can be enabled easily.

Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.

Fixes bug 16512561.

Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
 2014-07-23 18:58:08 +00:00
Alan Viverette
1bc61376f5 Merge "Make lighting style and attribute public" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
ef7ebbdff1 Merge "Allow medium-long-press to initiate drag-to-open menus" into lmp-dev 2014-07-23 18:56:15 +00:00
Alan Viverette
bca05f5ce7 Allow medium-long-press to initiate drag-to-open menus 
BUG: 16352041
Change-Id: I58933ae8cce1b3cecc1c533338d02a2f6ef1523b
 2014-07-23 20:15:44 -07:00
Prerepa Viswanadham
8caac741a0 Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
 2014-07-23 18:54:46 +00:00
Robert Ly
22bdcd2f82 Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 2014-07-23 18:44:51 +00:00
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1 
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
 2014-07-23 20:54:50 +00:00
Winson Chung
475f15fb9e Merge "Adding fallback transition for animating in/out of affiliate groups." into lmp-dev 2014-07-23 18:44:51 +00:00
Svetoslav
f8ffa567b5 Updating the save to PDF button icon. 
Change-Id: Ie62a22d6e16d15426f10afa0512b0083c52ff507
 2014-07-24 01:23:16 +00:00
Winson Chung
1907cd4782 Adding fallback transition for animating in/out of affiliate groups. 2014-07-24 01:21:03 +00:00
Yorke Lee
fd4354a9ee Merge "Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL" into lmp-dev 2014-07-23 18:31:55 +00:00
Jungshik Jang
b6591b8e53 Implement OneTouchRecordAction and stop one touch record. 
In addition to it, add api for clearTimerRecording as well.
Separately, I will replace logic for notifying message with callback
interface.

Bug: 16160962

Change-Id: I2368f7c697eb44ed4542c0ec4412c63a6ae41a5c
 2014-07-24 11:11:38 +09:00
Yorke Lee
624d0d64ab Improve documentation for for CallLog.CONTENT_URI_WITH_VOICEMAIL 
Change-Id: I6e1a4811f822f2211070edd7c9aa486005e53cea
 2014-07-23 19:09:27 -07:00
Geoffrey Borggaard
7968b28ad8 Merge "Fixes setting password through DevicePolicyManager" into lmp-dev 2014-07-23 18:25:52 +00:00
Geoffrey Borggaard
987672d262 Fixes setting password through DevicePolicyManager 
LockPatternUtils wasn't taking the userId into account when
looking up the salt.
Bug: 16204999

Change-Id: I0626b5a0a55c244122c24fb4446f270918f3187c
 2014-07-23 20:03:51 +00:00
Robert Greenwalt
c827f813e1 Merge "Reenable logging." into lmp-dev 2014-07-23 18:50:38 +00:00
Robert Greenwalt
a7d31bf307 Reenable logging. 
ConnectivityService has been rewritten for L and is in a stabilizing period.
We need the logging to track down bugs people report.
Restoring to Pre-L conditions.

If there's excess logging please report it - it probably indicates a bug.

Change-Id: I7baf891e3bf12e1545afeb92b8d5af0b01e12a7b
 2014-07-23 12:42:47 -07:00
Tao Bai
67ac461a0a Merge "WebView permission change" into lmp-dev 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change 
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
 2014-07-23 12:16:55 -07:00
Nancy Chen
2e02b9ea5c Merge "Hide multiple-account information if there is only a single account" into lmp-dev 2014-07-23 18:38:23 +00:00
Nancy Chen
6080118beb Hide multiple-account information if there is only a single account 
Adding an API method to telecomm to determine whether there is a single
account.

Bug: 16483795
Change-Id: If30d3a53458b4c784995f3f9e471c8163a8175a4
 2014-07-23 16:41:10 -07:00
Gabriel Peal
b8cb6518d8 Merge changes I925c8738,I1a8ad5c2 into lmp-dev 
* changes:
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
 2014-07-23 18:56:15 +00:00