OSDN Git Service
Amith Yamasani [Fri, 26 Aug 2016 00:48:15 +0000 (00:48 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d am:
1d513c845a am:
5eed3c9c38 am:
a106b52180 -s ours" into nyc-dev
am:
4ee46e5b99
Change-Id: I14593f2adae00ac390543e1bd2d189fca5ee9e05
Amith Yamasani [Fri, 26 Aug 2016 00:48:13 +0000 (00:48 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d am:
1d513c845a am:
5eed3c9c38 am:
a106b52180 -s ours
am:
b6cc1acb63
Change-Id: I47dd0f3ff80996d8cbd417324ee6ab12a738f774
Mark Goldstein [Fri, 26 Aug 2016 00:47:59 +0000 (00:47 +0000)]
Merge "docs: Fix typo" into nyc-dev
am:
8d660eebad
Change-Id: Ic8e68e5004b24b0e384a7bc1c58a43f87b891547
Mark Goldstein [Fri, 26 Aug 2016 00:47:56 +0000 (00:47 +0000)]
docs: Fix typo
am:
1c22ae296b
Change-Id: I775b87f43db12889696f015b8fe4051816e6d0fd
Narayan Kamath [Fri, 26 Aug 2016 00:42:28 +0000 (00:42 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5
am:
1238ffcd2c
Change-Id: I7f4d19c3c406157693aef46b695f0790b74d0cee
Dianne Hackborn [Fri, 26 Aug 2016 00:42:25 +0000 (00:42 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
am:
184edd6d93
Change-Id: Ib05f3baf0ba536da81777576708fd74cbd7ca57b
Dianne Hackborn [Fri, 26 Aug 2016 00:42:22 +0000 (00:42 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
am:
dd28b7b5f3
Change-Id: Id493898997e0745ac2f3c65c0dfb3e4ab5ea03ae
Mark Lu [Fri, 26 Aug 2016 00:42:17 +0000 (00:42 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
am:
30cba33a60
Change-Id: I0e7579b2dbc58ac7cace74d6987ddfe257455197
Mark Lu [Fri, 26 Aug 2016 00:42:13 +0000 (00:42 +0000)]
docs: rewrite one attribute description in R.attr
am:
5dabf06ae5
Change-Id: Ic502b32001326255097d7ba828eb62142da8606e
Mark Lu [Fri, 26 Aug 2016 00:42:06 +0000 (00:42 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
am:
d428a012ba
Change-Id: Ie87191e33c4f49cca44dd952a5722bb84c1441b8
Mark Lu [Fri, 26 Aug 2016 00:42:01 +0000 (00:42 +0000)]
docs: fix broken links in Activity reference
am:
fa43485910
Change-Id: I67134251790b12d53d31c6854073884f498ef1e5
Mark Lu [Fri, 26 Aug 2016 00:41:54 +0000 (00:41 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
am:
209fb02f84
Change-Id: I3236f69fd320c9b22321b54e464f450f3eef5062
Mark Lu [Fri, 26 Aug 2016 00:41:48 +0000 (00:41 +0000)]
docs: fix code snippets in SQL Databases page
am:
95698f127a
Change-Id: Id8ab4813cfd138edc65998f1258255b947f962ce
Hemal Patel [Thu, 25 Aug 2016 23:53:49 +0000 (16:53 -0700)]
resolve merge conflicts of
a544221 to nyc-dev-plus-aosp
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:06 +0000 (23:41 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d am:
1d513c845a am:
5eed3c9c38 am:
a106b52180 -s ours" into nyc-dev
Mark Goldstein [Thu, 25 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "docs: Fix typo" into nyc-dev
Amith Yamasani [Thu, 25 Aug 2016 23:39:37 +0000 (23:39 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d am:
1d513c845a am:
5eed3c9c38
am:
a106b52180 -s ours
Change-Id: Ia656bceb884d47015003d6c60f54f18f2217c01b
Amith Yamasani [Thu, 25 Aug 2016 23:29:52 +0000 (23:29 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d am:
1d513c845a
am:
5eed3c9c38
Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf
Narayan Kamath [Thu, 25 Aug 2016 23:29:29 +0000 (23:29 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76
am:
b0429bbad5
Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c
Amith Yamasani [Thu, 25 Aug 2016 23:22:00 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours am:
368ae62e9d
am:
1d513c845a
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06
Narayan Kamath [Thu, 25 Aug 2016 23:21:09 +0000 (23:21 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e
am:
a21569cd76
Change-Id: I502200a2a204e576944033a58ccd4be272603d5e
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0 am:
117a383099 -s ours
am:
368ae62e9d
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f
Narayan Kamath [Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624
am:
8f4f9e4d5e
Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of
5191225 to mnc-dev
am:
1fbc4b8624
Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf am:
dd0be992c0
am:
117a383099 -s ours
Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb
Andrew Solovay [Thu, 25 Aug 2016 22:43:21 +0000 (22:43 +0000)]
docs: Removing non-English /preview/ directories
am:
2d629c3e5b
Change-Id: I913c793085434c78b03a4cb39ee8ffb0377a6a9a
TreeHugger Robot [Thu, 25 Aug 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:34:02 +0000 (21:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:28 +0000 (21:33 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:24 +0000 (21:33 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
Hemal Patel [Thu, 25 Aug 2016 21:31:56 +0000 (21:31 +0000)]
Docs: Fixed the Bluetooth guide link
am:
65813dff14
Change-Id: I4502828940c4f2e33363e10728e97f484bc15651
Felipe Leme [Thu, 25 Aug 2016 21:09:50 +0000 (21:09 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am:
7f9ed1cd85 -s ours
am:
3bfa2451d4 -s ours
Change-Id: I4189d9ac8315cee7d8ac9618f11c84b82fae4caa
Felipe Leme [Thu, 25 Aug 2016 21:04:35 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
am:
7f9ed1cd85 -s ours
Change-Id: I32d32488785b49ee13353a503a31d9b152090262
Treehugger Robot [Thu, 25 Aug 2016 20:57:24 +0000 (20:57 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
Martijn Coenen [Thu, 25 Aug 2016 20:24:03 +0000 (20:24 +0000)]
Merge changes from topic 'utf' am:
0a357a1a73
am:
de8a6a66f6
Change-Id: If82cb8e885e6a378be2b85ff7dea4c7279758444
Martijn Coenen [Thu, 25 Aug 2016 20:16:55 +0000 (20:16 +0000)]
Merge changes from topic 'utf'
am:
0a357a1a73
Change-Id: I1d536c808022c9dca254436699371db53e22feb7
Martijn Coenen [Thu, 25 Aug 2016 20:08:14 +0000 (20:08 +0000)]
Merge changes from topic 'utf'
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
Dianne Hackborn [Wed, 24 Aug 2016 21:54:20 +0000 (14:54 -0700)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
Instead of crashing, log a wtf and recover. This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it. So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.
Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit
92aa4b2ba3c93cc344c885b50b75726599e6065d)
Mark Goldstein [Thu, 25 Aug 2016 19:48:07 +0000 (12:48 -0700)]
docs: Fix typo
Bug:
25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
Andrew Solovay [Thu, 25 Aug 2016 19:36:36 +0000 (12:36 -0700)]
docs: Removing non-English /preview/ directories
The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.
See first comment for doc stage location.
Change-Id: Ic22652d44696ec2647586e19aa61627d40232239
Ivan.liu [Thu, 25 Aug 2016 18:15:44 +0000 (18:15 +0000)]
Merge "Fix suspend crash issue on no GPU platform." am:
175621f517
am:
98b07f6b55
Change-Id: If835dcbebeda79d67c8afeeaafeae0b76d869df4
Ivan.liu [Thu, 25 Aug 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Fix suspend crash issue on no GPU platform."
am:
175621f517
Change-Id: Ia5b38915834859f569dda118f6ad61608a4b41a8
Treehugger Robot [Thu, 25 Aug 2016 18:01:05 +0000 (18:01 +0000)]
Merge "Fix suspend crash issue on no GPU platform."
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Sergio Giro [Thu, 21 Jul 2016 13:44:07 +0000 (14:44 +0100)]
Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
Narayan Kamath [Thu, 25 Aug 2016 09:43:25 +0000 (10:43 +0100)]
resolve merge conflicts of
5191225 to mnc-dev
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
Ivan.liu [Wed, 24 Aug 2016 09:19:03 +0000 (17:19 +0800)]
Fix suspend crash issue on no GPU platform.
eglChooseConfig should return false only if an error occured.
If eglChooseConfig is called with a valid attribute list,
no internal EGL errors occur. And if no available config matches
the requested attribute list, no configs are returned.
Not only the return value of eglChooseConfig should be checked,
the 'num_config' out-param must be inspected too.
If no configs were returned, and no error occurred, then 'num_config' will be 0.
Change-Id: Id36d88820b8e33713bc83e0d4b90c3fee7f005fd
Signed-off-by: Xiaowen Liu <xiaowen.liu@nxp.com>
Narayan Kamath [Thu, 25 Aug 2016 01:32:35 +0000 (01:32 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3 am:
8e168116d0 am:
dd496ec8b0 am:
472a7792f3
am:
77a9ef952c
Change-Id: Ief354f2d33f1e2df36233e3760d5ddda36282298
David Christie [Thu, 25 Aug 2016 01:32:27 +0000 (01:32 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b am:
3970ee98f7 am:
735699f3ef am:
551e6c786f am:
80b8f38224
am:
9c4d02fb3f
Change-Id: I780d3376eba44e04a435774bc1eea95c5c4c7481
David Christie [Thu, 25 Aug 2016 01:32:18 +0000 (01:32 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48 am:
0777ad8253 am:
187d841b75 am:
7f2aaf204d
am:
0ae74a8ccd
Change-Id: Id506887759ec76af2d4d931c286d37e46268b7ee
David Christie [Thu, 25 Aug 2016 01:32:10 +0000 (01:32 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70 am:
a6de8f20c7 am:
00e1e39ae2
am:
4f1d1fc92d
Change-Id: If4f80e980c9157671f9be48e5fb42766f7f81121
Narayan Kamath [Thu, 25 Aug 2016 01:25:55 +0000 (01:25 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3 am:
8e168116d0 am:
dd496ec8b0
am:
472a7792f3
Change-Id: I065968bf2bd6166eae33c7eec347e371a5edf447
David Christie [Thu, 25 Aug 2016 01:25:46 +0000 (01:25 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b am:
3970ee98f7 am:
735699f3ef am:
551e6c786f
am:
80b8f38224
Change-Id: I43da972f73a86a305d2b20db6cb2d30180e7287c
David Christie [Thu, 25 Aug 2016 01:25:38 +0000 (01:25 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48 am:
0777ad8253 am:
187d841b75
am:
7f2aaf204d
Change-Id: I64ff311815620d7e26ef91d33afc8499abf63c83
David Christie [Thu, 25 Aug 2016 01:25:30 +0000 (01:25 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70 am:
a6de8f20c7
am:
00e1e39ae2
Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc
David Christie [Thu, 25 Aug 2016 01:25:29 +0000 (01:25 +0000)]
resolve merge conflicts of
8aaffd9 to nyc-dev
am:
36246a43e5
Change-Id: Ica6479dcc1caf867f227dc00a46af79cfa1e7da5
David Christie [Wed, 24 Aug 2016 23:45:01 +0000 (16:45 -0700)]
resolve merge conflicts of
8aaffd9 to nyc-dev
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
Narayan Kamath [Wed, 24 Aug 2016 22:43:15 +0000 (22:43 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3 am:
8e168116d0
am:
dd496ec8b0
Change-Id: Ibd47e114558f0fc8ce64cd006a79e6ead7445f1d
David Christie [Wed, 24 Aug 2016 22:43:12 +0000 (22:43 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b am:
3970ee98f7 am:
735699f3ef
am:
551e6c786f
Change-Id: I9e0e082d0638795f191a188d3caad85f5fb992e5
David Christie [Wed, 24 Aug 2016 22:43:09 +0000 (22:43 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48 am:
0777ad8253
am:
187d841b75
Change-Id: I063f0cd3f53be4d58d123d05da7171a47014929d
David Christie [Wed, 24 Aug 2016 22:39:52 +0000 (22:39 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70
am:
a6de8f20c7
Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83
Narayan Kamath [Wed, 24 Aug 2016 22:33:43 +0000 (22:33 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04 am:
c01db7dca3
am:
8e168116d0
Change-Id: Iffa2e8ae4f02adaf4c031d8b5d50362ee9efb1d1
David Christie [Wed, 24 Aug 2016 22:33:41 +0000 (22:33 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b am:
3970ee98f7
am:
735699f3ef
Change-Id: I80e68cde7a673cfb269ecad9114dbb14850287b4
David Christie [Wed, 24 Aug 2016 22:33:39 +0000 (22:33 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48
am:
0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
David Christie [Wed, 24 Aug 2016 22:33:37 +0000 (22:33 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619
am:
3aaac55e70
Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
David Christie [Wed, 24 Aug 2016 22:30:20 +0000 (22:30 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5 am:
e24eb2dbb5
am:
362668b6f7
Change-Id: I019f76b45de78171ef888d2175dc9140be172784
Narayan Kamath [Wed, 24 Aug 2016 22:23:54 +0000 (22:23 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f am:
c11e8fcc04
am:
c01db7dca3
Change-Id: I056c33c5925a625b539df250af0fa7d48258b0f2
David Christie [Wed, 24 Aug 2016 22:23:52 +0000 (22:23 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c am:
c6ab92e93b
am:
3970ee98f7
Change-Id: I68f89fabe5603941e009f48f3277a2c40221ce74
David Christie [Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66
am:
d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
David Christie [Wed, 24 Aug 2016 22:23:46 +0000 (22:23 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d
am:
dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
David Christie [Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5
am:
e24eb2dbb5
Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
David Christie [Wed, 24 Aug 2016 22:16:07 +0000 (22:16 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev
am:
6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
Narayan Kamath [Wed, 24 Aug 2016 22:14:36 +0000 (22:14 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f am:
3c63bb367f
am:
c11e8fcc04
Change-Id: Idd314c1e12919d8cbaf9e71d72519d34d18e6f01
David Christie [Wed, 24 Aug 2016 22:14:32 +0000 (22:14 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30 am:
8788a2413c
am:
c6ab92e93b
Change-Id: I0d17aacc1d83b2bceb9abcfa3da1f1ff3dc74e09
David Christie [Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1
am:
af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
David Christie [Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
am:
975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
Felipe Leme [Wed, 17 Aug 2016 20:39:10 +0000 (13:39 -0700)]
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
(cherry pick of commits
2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Fixes:
30900628
Fixes:
28722556
(cherry picked from commit
20488d97cdc9aa7e98f6fd75c2890ba18781654a)
David Christie [Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)]
resolve merge conflicts of
a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
Amith Yamasani [Wed, 24 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf
am:
dd0be992c0
Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
Narayan Kamath [Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67 am:
86437ec433
am:
4d7740907e
Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
Narayan Kamath [Wed, 24 Aug 2016 20:30:13 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753 am:
b9fae65605
am:
c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
Narayan Kamath [Wed, 24 Aug 2016 20:30:09 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f
am:
3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30
am:
8788a2413c
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
Bill Yi [Wed, 24 Aug 2016 20:21:34 +0000 (20:21 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
e71ecb2c4d
am:
1bf3b41c0c
Change-Id: Ieb98d7845f5e27a7e17ebe5fb59c5a96ac1c32d4
Sergio Giro [Wed, 24 Aug 2016 20:21:30 +0000 (20:21 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am:
5d4732555d
am:
3b7c46af6f
Change-Id: I83f4e28e8f51cec728461e6db3c7d4ee8370b7fd
Sergio Giro [Wed, 24 Aug 2016 20:21:27 +0000 (20:21 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)" am:
c7f97dbd57
am:
1384be9641
Change-Id: I176a6a4d2bfc0102d2e7ce1570492fddf459cecc
Sergio Giro [Wed, 24 Aug 2016 20:21:24 +0000 (20:21 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec" am:
5b24bccbc8
am:
08b6a09f32
Change-Id: I6ccd70b3d20c28e54e1c7d5029cc3955bdc9e633
Jakub Pawlowski [Wed, 24 Aug 2016 20:15:35 +0000 (20:15 +0000)]
Merge "Add WorkSource to BLE scanning API" am:
d0a0ae349c -s ours
am:
2fde849eaf
Change-Id: Ie4c068313af530848f7955bdae9ce70b462d050d
Bill Yi [Wed, 24 Aug 2016 20:11:30 +0000 (20:11 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
e71ecb2c4d
Change-Id: Ic7d3bae780b52236b3fff2ab4d97ce1557129f0f
Sergio Giro [Wed, 24 Aug 2016 20:11:24 +0000 (20:11 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8"
am:
5d4732555d
Change-Id: I2cf28d3cd14a2e9de7835082c459310b9ff9679b
Sergio Giro [Wed, 24 Aug 2016 20:11:15 +0000 (20:11 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)"
am:
c7f97dbd57
Change-Id: Icb0abdcda06a9a7d450bc3f9af1e5dc474f1c7db
Sergio Giro [Wed, 24 Aug 2016 20:11:04 +0000 (20:11 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec"
am:
5b24bccbc8
Change-Id: I2fb2099cee414dc417ced879e0400cd7ff1dce3d
Jakub Pawlowski [Wed, 24 Aug 2016 20:06:47 +0000 (20:06 +0000)]
Merge "Add WorkSource to BLE scanning API"
am:
d0a0ae349c -s ours
Change-Id: I9522e2749aac82c71d08405478944346fc9d3ba1
Bill Yi [Wed, 24 Aug 2016 18:23:13 +0000 (11:23 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I1c7301e4e6d7e5fed1fd57d2fb9cb65baf819de0
Salvador Martinez [Wed, 24 Aug 2016 18:22:11 +0000 (18:22 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
am:
ed004e2958
Change-Id: I5d65ce33e3b5e8c8f97827a48e49ddf9a437f76b
Salvador Martinez [Wed, 24 Aug 2016 18:22:05 +0000 (18:22 +0000)]
Added error handling to settings suggestions list
am:
18bf581c77
Change-Id: If17623712eeea0e1aced3acedec24c27509e3bbc
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
Alan Viverette [Wed, 24 Aug 2016 17:37:54 +0000 (17:37 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
am:
462f29f77f
Change-Id: I0ea5702480dc7289dbad31355a6e403d39ab3c90
Alan Viverette [Wed, 24 Aug 2016 17:37:51 +0000 (17:37 +0000)]
Avoid potential re-entry as a result of child mutation
am:
66b3a0d1aa
Change-Id: Ia4ece22b06ef087921e8c341ec7112fd271598f2