OSDN Git Service
Alan Viverette [Tue, 17 Dec 2013 02:13:09 +0000 (02:13 +0000)]
Merge "Fix stroke color in GradientState.initializeWithState()"
Alan Viverette [Tue, 17 Dec 2013 01:55:08 +0000 (17:55 -0800)]
Fix stroke color in GradientState.initializeWithState()
BUG:
12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
Shishir Agrawal [Tue, 17 Dec 2013 01:47:14 +0000 (01:47 +0000)]
Chris Craik [Tue, 17 Dec 2013 01:37:57 +0000 (01:37 +0000)]
Merge "Use vertex assignment instead of manual copy"
Craig Mautner [Tue, 17 Dec 2013 01:35:09 +0000 (01:35 +0000)]
am
3b475fef: Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
* commit '
3b475fefa3b83ce49454936a0be3081753e3e8ad':
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
Shishir Agrawal [Tue, 17 Dec 2013 01:32:56 +0000 (17:32 -0800)]
Fixing build breakage due to:
c4d41755d73ffe85d179d42a4f0c993b49303145
Mismatched @param in javadoc.
Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
Alan Viverette [Tue, 17 Dec 2013 01:20:22 +0000 (01:20 +0000)]
Merge "Replace auto-create in findViewById() with explicit create() API"
Chris Craik [Tue, 17 Dec 2013 01:08:15 +0000 (17:08 -0800)]
Use vertex assignment instead of manual copy
Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
Zhijun He [Tue, 17 Dec 2013 00:56:35 +0000 (16:56 -0800)]
camera2: update java docs for metadata tag spec update
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode
Bug:
12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Craig Mautner [Tue, 17 Dec 2013 00:50:19 +0000 (00:50 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask"
Shishir Agrawal [Tue, 17 Dec 2013 00:44:40 +0000 (00:44 +0000)]
Merge "Adding support for SIM communication from Android over logical channels."
Chris Craik [Tue, 17 Dec 2013 00:11:28 +0000 (00:11 +0000)]
Merge "Create private properties on GLCanvas for experimentation with 3d"
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Alan Viverette [Mon, 16 Dec 2013 23:49:35 +0000 (23:49 +0000)]
Merge "Refactor display adjustments into their own utils class"
Alan Viverette [Mon, 16 Dec 2013 23:36:49 +0000 (23:36 +0000)]
Merge "Don't cast FastScroller adapter to BaseAdapter"
Trevor Johns [Mon, 16 Dec 2013 23:27:57 +0000 (23:27 +0000)]
am
b8928b05: am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
Docs: Clean up HCE dev guide
Scott Main [Mon, 16 Dec 2013 23:27:51 +0000 (23:27 +0000)]
Elliott Hughes [Mon, 16 Dec 2013 23:27:39 +0000 (23:27 +0000)]
am
3bfc6e76: am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
3bfc6e76e627d4122a774488f36fb843bb3694fb':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 23:27:30 +0000 (23:27 +0000)]
am
409b7c98: (-s ours) am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
409b7c98b47cb7ece2760aa53730233f54946e46':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Trevor Johns [Mon, 16 Dec 2013 23:05:48 +0000 (23:05 +0000)]
am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 23:02:44 +0000 (23:02 +0000)]
am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
ed8d921a2e8feae859bb1899356a936eb84fe50f':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:59:19 +0000 (14:59 -0800)]
am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
eec66178668d22910d3889e62087b3797ebf6dd2':
Docs: Clean up HCE dev guide
Chris Craik [Mon, 16 Dec 2013 01:10:19 +0000 (17:10 -0800)]
Create private properties on GLCanvas for experimentation with 3d
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
Trevor Johns [Mon, 16 Dec 2013 22:56:38 +0000 (22:56 +0000)]
am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
73c1681b2f557dfba09a2e1a071dec190dd05e36':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:43:47 +0000 (22:43 +0000)]
Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Fri, 13 Dec 2013 04:09:14 +0000 (20:09 -0800)]
Docs: Clean up HCE dev guide
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.
Issue:
11991294
Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
Robert Shih [Mon, 16 Dec 2013 22:35:28 +0000 (22:35 +0000)]
Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below."
Alan Viverette [Mon, 16 Dec 2013 21:45:39 +0000 (13:45 -0800)]
Refactor display adjustments into their own utils class
Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
Igor Murashkin [Mon, 16 Dec 2013 21:41:02 +0000 (21:41 +0000)]
Merge "camera2: Add support for embedding images into javadoc"
Scott Main [Mon, 16 Dec 2013 21:38:11 +0000 (21:38 +0000)]
Scott Main [Mon, 16 Dec 2013 21:34:58 +0000 (21:34 +0000)]
Scott Main [Mon, 16 Dec 2013 21:31:45 +0000 (13:31 -0800)]
Scott Main [Mon, 16 Dec 2013 21:29:18 +0000 (21:29 +0000)]
Scott Main [Mon, 16 Dec 2013 21:22:08 +0000 (13:22 -0800)]
fix typo
bug:
12174614
Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
Elliott Hughes [Mon, 16 Dec 2013 21:07:24 +0000 (21:07 +0000)]
am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:04:50 +0000 (21:04 +0000)]
am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
a012fee3c31803799176f3efb75cf2f929eeb062':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:01:19 +0000 (13:01 -0800)]
am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
5d6332e3744e37ced079e5360f1fa3e0e5681d57':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 20:58:11 +0000 (20:58 +0000)]
am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
4275cae4084cff0e267d9e0d63b968aa0788909a':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Christopher Tate [Mon, 16 Dec 2013 20:52:13 +0000 (20:52 +0000)]
am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
e998b6076532daaa9c2c621a09a04d67a75a5ad0':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:49:55 +0000 (12:49 -0800)]
am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
6040bd47f41fd56ee608f6a80a0babe942ea1df3':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Igor Murashkin [Wed, 11 Dec 2013 21:31:38 +0000 (13:31 -0800)]
camera2: Add support for embedding images into javadoc
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family
Bug:
12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
John Reck [Mon, 16 Dec 2013 18:55:22 +0000 (18:55 +0000)]
Merge "Add drawGlFunctor support to RenderThread"
Andres Morales [Mon, 16 Dec 2013 18:50:23 +0000 (18:50 +0000)]
Merge "Adding accessor for integer tech codes to Tag"
Nick Kralevich [Mon, 16 Dec 2013 18:47:03 +0000 (18:47 +0000)]
am
fc800d40: am
fbd6d5a8: am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
fc800d407d695926ba07299c4e27d1e06284098f':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Andres Morales [Fri, 13 Dec 2013 00:37:09 +0000 (16:37 -0800)]
Adding accessor for integer tech codes to Tag
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
Nick Kralevich [Mon, 16 Dec 2013 18:44:04 +0000 (18:44 +0000)]
am
fbd6d5a8: am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Nick Kralevich [Mon, 16 Dec 2013 18:41:03 +0000 (18:41 +0000)]
am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
09fdc159552c85032ce9860fc0d63b6eebeca82a':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Katie McCormick [Mon, 16 Dec 2013 18:39:25 +0000 (18:39 +0000)]
am
0f3390f8: am
c4927389: am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:36:41 +0000 (18:36 +0000)]
am
c4927389: am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c49273895ea96da5d88c806fb6acd4a92b963f84':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:36:39 +0000 (10:36 -0800)]
am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Katie McCormick [Mon, 16 Dec 2013 18:33:42 +0000 (18:33 +0000)]
am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
1e609ac45df13fed93df81e805ea6d6485da3aa0':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:29:57 +0000 (10:29 -0800)]
am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Katie McCormick [Mon, 16 Dec 2013 18:28:00 +0000 (18:28 +0000)]
am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:25:12 +0000 (18:25 +0000)]
Merge "Doc update: clarify version of flags." into klp-docs
ztenghui [Mon, 16 Dec 2013 17:18:12 +0000 (17:18 +0000)]
Merge "Calculate and show Ambient shadow."
Narayan Kamath [Mon, 16 Dec 2013 15:29:39 +0000 (15:29 +0000)]
am
1dfe7990: am
8f90e476: am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
1dfe799027383bb0f2c2f38facca631d4968de8e':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:26:41 +0000 (15:26 +0000)]
am
8f90e476: am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
8f90e47694b441941fdf5f17fcb9927ec23fb50b':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:23:50 +0000 (15:23 +0000)]
am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
28635ca3e3815ca01417ef03dd9debd938e34307':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:20:26 +0000 (07:20 -0800)]
am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
44291d9c2722e0d22dc6f909585f4302abdce205':
Use StrictJarFile instead of JarFile for cert collection.
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.
Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
In commit
08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
- CONFIG_MCC = 0x0001,
- CONFIG_MNC = 0x0002,
+ CONFIG_MCC = ACONFIGURATION_MCC,
+ CONFIG_MNC = ACONFIGURATION_MCC,
This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.
Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Jesse Hall [Sun, 15 Dec 2013 00:25:52 +0000 (00:25 +0000)]
am
1add7894: am
97b3e43f: am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
1add78943fa4ce3e74103ce9ef60a18f86483fc2':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:22:37 +0000 (00:22 +0000)]
am
97b3e43f: am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
97b3e43ff108cb4761450732fc02e4b69502b8a0':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:20:11 +0000 (00:20 +0000)]
am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
e2e15d6da1936890117ad21fb6b18cce321c7d2b':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:16:24 +0000 (16:16 -0800)]
am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
a0ab49bb52f44eac97f81117d6864edd6a2e0487':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fix incorrect name in eglSwapBuffers log wrapper"
ztenghui [Tue, 3 Dec 2013 18:38:55 +0000 (10:38 -0800)]
Calculate and show Ambient shadow.
Basically we compute the shadow as a strip of triangles, whose alpha value
is the strength of the shadow.
We use the normal to extend the geometry.
And we use static function and try to avoid new/malloc in the computation.
Change-Id: I382286f1cad351bd5ff983f76f446c075819dcaf
John Reck [Fri, 13 Dec 2013 22:25:19 +0000 (14:25 -0800)]
Add drawGlFunctor support to RenderThread
Add gl functor to the prototype support to allow
webview team to begin playing with RT
Also create RemoteGLRenderer to avoid needing to make
breaking changes to GLRenderer. Currently the differences
are mainly around mFunctorsRunnable and how it queues itself up
Change-Id: I1ca39056189b68cd7b8dded4dd5889d331f6660a
Kenny Root [Fri, 13 Dec 2013 23:59:51 +0000 (15:59 -0800)]
resolved conflicts for merge of
e0b14ea7 to master
Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51
Amith Yamasani [Fri, 13 Dec 2013 22:57:39 +0000 (22:57 +0000)]
am
aab51473: Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev
* commit '
aab514738e346aae410a5a8339e2610a3b393bc6':
Fix bad xml generation due to mismatched start/end tags
Adam Lesinski [Fri, 13 Dec 2013 22:44:06 +0000 (14:44 -0800)]
Merge commit '
e89a9a3f' into manualmerge
Tim Murray [Fri, 13 Dec 2013 22:39:35 +0000 (22:39 +0000)]
Merge "Handle user-defined cache path for RS."
Kenny Root [Fri, 13 Dec 2013 22:23:33 +0000 (22:23 +0000)]
am
31b9ec01: am
62d509d2: am
37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '
31b9ec01ff6087773cb35af6824a6422a0181afb':
Use java.util.Objects instead on internal API
Kenny Root [Fri, 13 Dec 2013 22:20:37 +0000 (22:20 +0000)]
am
62d509d2: am
37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '
62d509d24f91959b75219edd0ab1a6f22b82c600':
Use java.util.Objects instead on internal API
Kenny Root [Fri, 13 Dec 2013 22:17:29 +0000 (14:17 -0800)]
am
37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '
37c69fdd826f3973966430adc1abfbefc19bc16e':
Use java.util.Objects instead on internal API
Amith Yamasani [Fri, 13 Dec 2013 22:16:57 +0000 (22:16 +0000)]
Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev
Kenny Root [Fri, 13 Dec 2013 22:12:52 +0000 (22:12 +0000)]
Merge "Use java.util.Objects instead on internal API"
Chris Craik [Fri, 13 Dec 2013 21:55:49 +0000 (21:55 +0000)]
Merge "3d view system!"
Kenny Root [Fri, 13 Dec 2013 20:00:26 +0000 (12:00 -0800)]
Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.
Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
Tim Murray [Fri, 13 Dec 2013 20:57:36 +0000 (12:57 -0800)]
Handle user-defined cache path for RS.
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
Alan Viverette [Fri, 13 Dec 2013 19:01:21 +0000 (11:01 -0800)]
Don't cast FastScroller adapter to BaseAdapter
BUG:
12130253
Change-Id: I78864a4603599daf39829d33414202c43ca97aa9
Svetoslav [Tue, 26 Nov 2013 01:45:00 +0000 (17:45 -0800)]
Fixing some accessibility bugs.
1. Views not important for accessibility should not send events.
2. The base View implementation should not add it self to the
list of children for accessibility.
3. Null pointer exception in AccessibilityNodeInfoCache.
Change-Id: Ie5b373362269200ead13ffe632679bd42ee40309
Adam Lesinski [Fri, 13 Dec 2013 18:33:24 +0000 (18:33 +0000)]
Merge "Introduce a Lifecycle for system services" into klp-modular-dev
Adam Lesinski [Fri, 13 Dec 2013 18:33:01 +0000 (18:33 +0000)]
Merge "Introduce a Lifecycle for system services"
Amith Yamasani [Fri, 13 Dec 2013 17:05:26 +0000 (09:05 -0800)]
Fix bad xml generation due to mismatched start/end tags
This was causing a problem with lost policy permissions when global proxy was set for a user.
Extract all xml literals into constants to avoid such errors in the future.
Fix some minor line length issues.
Bug:
12065908
Change-Id: I11d532b4aaa978a09ac562fd6b9ddce1f699a03e
Narayan Kamath [Thu, 12 Dec 2013 16:54:33 +0000 (16:54 +0000)]
Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.
bug:
10193060
(cherry picked from commit
eb565dc527eda8c0a43df0d1f30132638ca4ba20)
Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
Narayan Kamath [Fri, 13 Dec 2013 16:12:15 +0000 (16:12 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Kristian Monsen [Fri, 13 Dec 2013 07:59:37 +0000 (23:59 -0800)]
resolved conflicts for merge of
800d4d72 to master
Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef
Kristian Monsen [Fri, 13 Dec 2013 07:31:40 +0000 (07:31 +0000)]
am
b90d8591: am
13b648eb: am
584ace0d: Merge "Fix one and hide the other warnings from core/jni"
* commit '
b90d8591343e1af176ff181e6bb343f739c037a6':
Fix one and hide the other warnings from core/jni
Kristian Monsen [Fri, 13 Dec 2013 07:27:41 +0000 (07:27 +0000)]
am
13b648eb: am
584ace0d: Merge "Fix one and hide the other warnings from core/jni"
* commit '
13b648ebff99a3fb8c26152745d294a55f8c11b7':
Fix one and hide the other warnings from core/jni
Kristian Monsen [Fri, 13 Dec 2013 06:38:21 +0000 (22:38 -0800)]
am
584ace0d: Merge "Fix one and hide the other warnings from core/jni"
* commit '
584ace0d3f79ff43db9298798065dd5beaa66a45':
Fix one and hide the other warnings from core/jni
Kristian Monsen [Fri, 13 Dec 2013 06:32:03 +0000 (06:32 +0000)]
Merge "Fix one and hide the other warnings from core/jni"
Adam Lesinski [Fri, 6 Dec 2013 00:48:06 +0000 (16:48 -0800)]
Introduce a Lifecycle for system services
Cherry-picked from klp-modular-dev
Provide an abstract class for system services to extend from,
similar to the android.app.Service.
This will allow services to receive events in a uniform way,
and will allow services to be created and started in the
correct order regardless of whether or not a particular
service exists.
Similar to android.app.Service, services are meant to implement
Binder interfaces as inner classes. This prevents services from
having incestuous access to each other and makes them use the
public API.
Change-Id: Iaacfee8d5f080a28d7cc606761f4624673ed390f
Yorke Lee [Fri, 13 Dec 2013 01:30:31 +0000 (01:30 +0000)]
Merge "Fix SDK build break due to link in hidden field in comment"
Yorke Lee [Fri, 13 Dec 2013 01:29:03 +0000 (17:29 -0800)]
Fix SDK build break due to link in hidden field in comment
Change-Id: I10bcfa01d1aea4fd95a99e4230f5c0217ec188ac