Kenny Guy
ecc9f9b6f3
Merge "Add flag to allow fetching related users recent tasks."
2014-03-18 11:43:46 +00:00
Mark Renouf
95478f67a4
Merge "Make InternalListener static to avoid referencing SpeechRecognizer."
2014-03-18 01:58:26 +00:00
Wonsik Kim
edb67190d6
Merge "Revert "VideoPlaneView initial implementation""
2014-03-18 01:00:59 +00:00
Alan Viverette
97d9b65470
Lower tap timeout to 100ms, because 180ms is a lot of ms
...
Change-Id: I708848480544825474785e0918feba70c1089090
2014-03-17 16:16:33 -07:00
Mark Renouf
b37866db46
Make InternalListener static to avoid referencing SpeechRecognizer.
...
Change-Id: I03bc1a5f5188551608395f3468aa69e622601820
2014-03-17 18:15:51 -04:00
Igor Murashkin
033a68ca10
Merge "camera2: Don't log vendor tag errors when camera HAL too old"
2014-03-17 21:53:48 +00:00
Chris Craik
db62c232b9
Merge "Remove castsShadow and globalCamera APIs"
2014-03-17 21:03:15 +00:00
Igor Murashkin
5614cbe644
camera2: Don't log vendor tag errors when camera HAL too old
...
Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
2014-03-17 14:00:55 -07:00
Chris Craik
34f67f26e3
Remove castsShadow and globalCamera APIs
...
Change-Id: I5c1c375f45946609b1635d952c5adf55e23bdd60
2014-03-17 13:24:08 -07:00
Kenny Guy
82326a98a4
Add flag to allow fetching related users recent tasks.
...
Fetch related users recent tasks along with requested users
tasks when flag is set
Set flag in requests coming from systemui/recents.
Change-Id: I985e2d9d6b9728603685fc6126e8193af119e172
2014-03-17 19:45:17 +00:00
Dianne Hackborn
4c1d506d7b
Merge "Start enforcing explicit intents for Context.bindService()"
2014-03-17 19:30:43 +00:00
Chris Craik
618236fe88
Revert "Remove castsShadow and globalCamera APIs"
...
This reverts commit 0334c314a5 .
Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
2014-03-17 19:27:49 +00:00
Dianne Hackborn
10ad98223f
Start enforcing explicit intents for Context.bindService()
...
No longer prints a warning, now throws an exception.
Also fix a bug in UserManagerService that was causing an
exception while booting.
Change-Id: I3b43cfe08067da840b6850b9bed58664d36d34f1
2014-03-17 11:28:36 -07:00
Chris Craik
0334c314a5
Remove castsShadow and globalCamera APIs
...
Change-Id: I4d81a7849eba60a1a9debce74eedd55d6331842d
2014-03-17 18:13:31 +00:00
John Reck
0a6b0031f0
Merge "Rename DisplayList->RenderNode"
2014-03-17 18:12:02 +00:00
Jessica Hummel
f1c9044057
Merge "Standardize the provisioning intent action."
2014-03-17 18:01:28 +00:00
Jeff Sharkey
432f755d44
am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'ac0f9ffda2a7e48d2d641654dafd11b8da39830a':
Null pointer exception in FileRotator.java
2014-03-17 17:57:13 +00:00
John Reck
f666ad7046
Rename DisplayList->RenderNode
...
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
2014-03-17 10:30:32 -07:00
Jessica Hummel
03dd22079c
Standardize the provisioning intent action.
...
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
2014-03-17 16:53:27 +00:00
Jeff Sharkey
da07fe64b0
am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
Null pointer exception in FileRotator.java
2014-03-17 16:39:13 +00:00
Wonsik Kim
475e3f0e88
Revert "VideoPlaneView initial implementation"
...
This reverts commit 5f8aa41429 .
Change-Id: I161748f365512c5e24acba2c3d9ebd9405fa8e3f
2014-03-17 11:17:47 +00:00
Jaewan Kim
f207ec76a5
Merge "EthernetDataTracker: Update hardware address when interface is changed"
2014-03-16 10:23:35 +00:00
John Reck
e2d3f28e85
Merge "Revert "Rename DisplayList->RenderNode""
2014-03-15 02:15:34 +00:00
John Reck
31f9458908
Revert "Rename DisplayList->RenderNode"
...
Missed some test(s), reverting to fix build
This reverts commit ef09d8cf94 .
Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666
2014-03-15 02:14:53 +00:00
John Reck
759067f39a
Merge "Rename DisplayList->RenderNode"
2014-03-15 00:25:34 +00:00
Ruben Brunk
38900b1554
Merge "hal3: Add availableHotPixelModes, update modes."
2014-03-15 00:14:56 +00:00
John Reck
ef09d8cf94
Rename DisplayList->RenderNode
...
Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad
2014-03-14 17:14:16 -07:00
Yohei Yukawa
c05362b84c
am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:59:35 +00:00
Yohei Yukawa
77943308f5
am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 21:54:49 +00:00
Craig Mautner
421a1dd197
Merge "Launch new tasks with Doc Centric flag."
2014-03-14 21:43:28 +00:00
Craig Mautner
d00f47402c
Launch new tasks with Doc Centric flag.
...
Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.
Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795
2014-03-14 14:42:23 -07:00
Tim Kilbourn
9b18001ab5
am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev
...
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
Add leanback device features.
2014-03-14 20:50:40 +00:00
Tim Kilbourn
9873e099c3
am 55740325: Merge "Add leanback device features." into klp-modular-dev
...
* commit '557403250b9accf4f17ab87f636f1722949960a3':
Add leanback device features.
2014-03-14 20:42:18 +00:00
Tim Kilbourn
557403250b
Merge "Add leanback device features." into klp-modular-dev
2014-03-14 20:38:51 +00:00
Ruben Brunk
9d454fd609
hal3: Add availableHotPixelModes, update modes.
...
Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
2014-03-14 13:35:57 -07:00
Christopher Tate
5e0e7b56a9
Merge "Make RegisteredServicesCache understand ASEC-based updates"
2014-03-14 19:16:07 +00:00
John Spurlock
30672787d2
am dc28dc63: am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
...
* commit 'dc28dc63a7c04dcb87e257700a1d7aea40de0ce3':
Fix doc typos in AppOpsManager.java
2014-03-14 17:53:53 +00:00
Svetoslav
353e0cf718
am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
...
* commit '78a06696b714dd97076b98a415aadcc174fe3af0':
PrintSpooler crash if printer is reported to have only one color mode.
2014-03-14 17:53:41 +00:00
John Spurlock
399cac5b33
am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
...
* commit '75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
Fix doc typos in AppOpsManager.java
2014-03-14 16:32:24 +00:00
JP Abgrall
7238585e2e
am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
...
* commit '4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:32:21 +00:00
Chad Brubaker
4b59883afd
am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
...
* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:32:18 +00:00
Svetoslav
9011908230
am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
...
* commit '358eaa7825140ee571a7b9d61705fb3adb5b60aa':
PrintSpooler crash if printer is reported to have only one color mode.
2014-03-14 16:32:15 +00:00
John Spurlock
75985bbe2f
am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
...
* commit '62826f55be4415684b4e321469298ba43d598bbb':
Fix doc typos in AppOpsManager.java
2014-03-14 16:28:15 +00:00
JP Abgrall
4f26139661
am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
...
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
2014-03-14 16:28:09 +00:00
Chad Brubaker
7c2b1625d6
am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
...
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
2014-03-14 16:27:58 +00:00
Svetoslav
358eaa7825
am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
...
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
PrintSpooler crash if printer is reported to have only one color mode.
2014-03-14 16:27:55 +00:00
Jose Lima
92703e62c1
resolved conflicts for merge of 4882ddfa to master
...
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
2014-03-13 21:26:48 -07:00
Yohei Yukawa
fd2f8d4341
am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
* commit '51b921d0e33302b3f431dcfa15bd6588408525ea':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
2014-03-14 03:03:08 +00:00
Yohei Yukawa
51b921d0e3
DO NOT MERGE - Preserve the order of InputMethodManager method calls
...
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520
This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.
InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.
See the following demo code:
Final InputMethodManager imm = ...;
imm.setAdditionalInputMethodSubtypes(id, subTypes);
Final List<InputMethodInfo> ims = imm.getInputMethodList();
Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.
With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.
BUG: 13033954
BUG: 13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
2014-03-14 11:52:09 +09:00
Adam Powell
6cde6c75b3
am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
...
* commit '41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
Add a config override for ViewConfiguration#hasPermanentMenuKey
2014-03-13 23:57:19 +00:00