Ben Murdoch
c4c484c6a7
am e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDoc
...
* commit 'e9529bc4cb28176fddf1e7916c7791e5974f2fc3':
Fix JavaDoc
2014-03-17 23:32:25 +00:00
Doug Zongker
11e09bd6d1
Merge "resolved conflicts for merge of a1ca303a to master"
2014-03-17 23:30:38 +00:00
Doug Zongker
f168e4c46c
resolved conflicts for merge of a1ca303a to master
...
Change-Id: I37ef6102fd79e396fa3e50d6c012a667488a306d
2014-03-17 16:24:30 -07: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
Alan Viverette
33e3e1b920
Merge "Build logtags for services"
2014-03-17 22:55:19 +00:00
ztenghui
d5a8503c7a
Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"
2014-03-17 22:38:47 +00:00
ztenghui
99af9429cd
Fix the missing spot shadow when DEBUG_SHADOW is turned on
...
In the current design, this error should be tolerated since the delta should
be small enough. So we should not return here.
Change-Id: I251db2882b331d37ae7f0896e9aa95d69a5650da
2014-03-17 15:35:25 -07:00
Alan Viverette
12cf314d87
Build logtags for services
...
Change-Id: I6a146ae46df1a9d215fcf5bab7a2ef1876b94a1e
2014-03-17 15:31:04 -07: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
ztenghui
630c0abaea
Merge "Create one hole inside the umbra area to avoid overdraw."
2014-03-17 21:12: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
Geoff Mendal
40436a20c6
am 9229c596: (-s ours) am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
...
* commit '9229c596cb35504c23687295868c59c009a23ad5':
Import translations. DO NOT MERGE
2014-03-17 19:40:12 +00:00
Ben Murdoch
e9529bc4cb
am d292aac5: am 889a1ddd: Fix JavaDoc
...
* commit 'd292aac5eb48f6970ba4795265bd45761c063209':
Fix JavaDoc
2014-03-17 19:37:25 +00:00
Ben Murdoch
d292aac5eb
am 889a1ddd: Fix JavaDoc
...
* commit '889a1ddd00b74933d5f7daa651d98133bcb034ba':
Fix JavaDoc
2014-03-17 19:34:12 +00:00
Dianne Hackborn
4c1d506d7b
Merge "Start enforcing explicit intents for Context.bindService()"
2014-03-17 19:30:43 +00:00
Chris Craik
e0583b2c93
Merge "Revert "Remove castsShadow and globalCamera APIs""
2014-03-17 19:28:30 +00:00
Chris Craik
618236fe88
Revert "Remove castsShadow and globalCamera APIs"
...
This reverts commit 0334c314a5721f49b4d172a9cefe10f157cb28a4.
Change-Id: I64714d17fb877e1b43c65eb44820d1128281c7a2
2014-03-17 19:27:49 +00:00
Ben Murdoch
889a1ddd00
Fix JavaDoc
...
Change-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371
2014-03-17 19:20:43 +00:00
Chris Craik
1a1ec62557
Merge "Remove castsShadow and globalCamera APIs"
2014-03-17 19:07:26 +00:00
Dan Stoza
8a358e44cc
Merge "Remove deprecated BufferQueue constructor"
2014-03-17 18:47:52 +00:00
Dan Stoza
09076f7263
Merge "Remove deprecated BufferQueue constructor"
2014-03-17 18:45:45 +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
Geoff Mendal
77bed997bb
Merge "Import translations. DO NOT MERGE"
2014-03-17 18:25:59 +00:00
Geoff Mendal
699295aaaa
Merge "Import translations. DO NOT MERGE"
2014-03-17 18:25:39 +00: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
Torne (Richard Coles)
a1ca303a78
am 966bfa8d: am 01252217: Merge "Fix javadoc." into klp-modular-dev
...
* commit '966bfa8df40d3d27bacdb2d9f8eb05c3eebafd01':
Fix javadoc.
2014-03-17 18:08:17 +00:00
Geoff Mendal
9229c596cb
am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ae327cd206bb648a8e88e8f49f678a3ba4627a4e':
Import translations. DO NOT MERGE
2014-03-17 18:04:23 +00:00
Torne (Richard Coles)
966bfa8df4
am 01252217: Merge "Fix javadoc." into klp-modular-dev
...
* commit '01252217a5d779c885645028a5df70215e7be4f4':
Fix javadoc.
2014-03-17 18:02:10 +00:00
Jessica Hummel
f1c9044057
Merge "Standardize the provisioning intent action."
2014-03-17 18:01:28 +00:00
Torne (Richard Coles)
01252217a5
Merge "Fix javadoc." into klp-modular-dev
2014-03-17 17:58:30 +00:00
Geoff Mendal
ae327cd206
am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
...
* commit '028992915f75c858f177d0f61ea469bc47ea50b4':
Import translations. DO NOT MERGE
2014-03-17 17:57:59 +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
Geoff Mendal
028992915f
am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c3281db2fb874f56d5612b9d3f07bd91067755ac':
Import translations. DO NOT MERGE
2014-03-17 17:54:58 +00:00
Jeff Sharkey
ac0f9ffda2
am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'da07fe64b09bbf75cf831067dfe678ed06950f8e':
Null pointer exception in FileRotator.java
2014-03-17 17:52:56 +00:00
Torne (Richard Coles)
5aa9c5a77b
Fix javadoc.
...
Fix javadoc reference missing a #
Bug: 13246311
Change-Id: Ifc06234943339250feb5b4f2077af03c35be076e
2014-03-17 17:51:40 +00:00
John Reck
f666ad7046
Rename DisplayList->RenderNode
...
Change-Id: Idcca6f26ba6282594789962f5edb3ed53a290fef
2014-03-17 10:30:32 -07:00
Geoff Mendal
19a1dcf04f
Import translations. DO NOT MERGE
...
Change-Id: Ic610f196330c190df9bf2dfcceb0dd2437250b7d
Auto-generated-cl: translation import
2014-03-17 10:18:49 -07:00
Jessica Hummel
02b872bee1
Merge "Temporarily allow system apps to fully act across users."
2014-03-17 17:17:36 +00:00
Geoff Mendal
a97cd79fea
Import translations. DO NOT MERGE
...
Change-Id: Ic78ab9269a3e4b81d94756bcba14123c05969387
Auto-generated-cl: translation import
2014-03-17 10:12:09 -07:00
Geoff Mendal
47e6d5d274
Merge "Import translations. DO NOT MERGE"
2014-03-17 17:10:24 +00:00
ztenghui
50ecf849cb
Create one hole inside the umbra area to avoid overdraw.
...
bug:13439450
Change-Id: I859575196bd5a3029f447883025a6ec3a1f1face
2014-03-17 10:10:02 -07:00
Geoff Mendal
56bdacccb9
Import translations. DO NOT MERGE
...
Change-Id: I0099deb9f73a8d3c6ea1ff8a8aa8808d7f1c322e
Auto-generated-cl: translation import
2014-03-17 10:08:44 -07:00
Jessica Hummel
b4ca2639e4
Temporarily allow system apps to fully act across users.
...
This is to allow launcher to start activities across users
and will be reverted when an alternative API is provided.
Change-Id: I67ec3e9d419afffbadce37d6e9958e2dfc096fb2
2014-03-17 17:08:22 +00:00
Jessica Hummel
03dd22079c
Standardize the provisioning intent action.
...
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
2014-03-17 16:53:27 +00:00
Geoff Mendal
c3281db2fb
am 65325236: (-s ours) Import translations. DO NOT MERGE
...
* commit '6532523652cf16d3e498939965defab4bd22c491':
Import translations. DO NOT MERGE
2014-03-17 16:46:53 +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
Jeff Sharkey
eeb36c5cfc
am d88d8174: Merge "Null pointer exception in FileRotator.java"
...
* commit 'd88d817498327462f42e50348239eac59147f310':
Null pointer exception in FileRotator.java
2014-03-17 09:36:03 -07:00