Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Narayan Kamath
1238ffcd2c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
...
am: b0429bbad5
2016-08-25 23:29:29 +00:00
Narayan Kamath
b0429bbad5
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
...
am: a21569cd76
2016-08-25 23:21:09 +00:00
Narayan Kamath
a21569cd76
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
...
am: 8f4f9e4d5e
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e
resolve merge conflicts of 5191225 to mnc-dev
...
am: 1fbc4b8624
2016-08-25 23:08:25 +00:00
TreeHugger Robot
184edd6d93
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
2016-08-25 21:38:45 +00:00
Mark Lu
30cba33a60
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
2016-08-25 21:34:04 +00:00
Mark Lu
d428a012ba
Merge "docs: fix broken links in Activity reference" into nyc-dev
2016-08-25 21:33:31 +00:00
Mark Lu
209fb02f84
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd
Docs: Fixed the Bluetooth guide link
...
am: 65813dff14
2016-08-25 21:31:56 +00:00
Dianne Hackborn
dd28b7b5f3
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 92aa4b2ba3
2016-08-25 19:49:41 +00:00
Mark Goldstein
1c22ae296b
docs: Fix typo
...
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
2016-08-25 12:48:07 -07:00
Andrew Solovay
2d629c3e5b
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
2016-08-25 12:36:36 -07:00
Narayan Kamath
1fbc4b8624
resolve merge conflicts of 5191225 to mnc-dev
...
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
2016-08-25 10:43:25 +01:00
Narayan Kamath
77a9ef952c
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0
...
am: 472a7792f3
2016-08-25 01:25:55 +00:00
David Christie
9c4d02fb3f
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
2016-08-25 01:25:46 +00:00
David Christie
0ae74a8ccd
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75
...
am: 7f2aaf204d
2016-08-25 01:25:38 +00:00
David Christie
4f1d1fc92d
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7
...
am: 00e1e39ae2
2016-08-25 01:25:30 +00:00
David Christie
36246a43e5
resolve merge conflicts of 8aaffd9 to nyc-dev
...
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
2016-08-24 16:45:01 -07:00
Narayan Kamath
472a7792f3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0
...
am: dd496ec8b0
2016-08-24 22:43:15 +00:00
David Christie
80b8f38224
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
2016-08-24 22:43:12 +00:00
David Christie
7f2aaf204d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253
...
am: 187d841b75
2016-08-24 22:43:09 +00:00
David Christie
00e1e39ae2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70
...
am: a6de8f20c7
2016-08-24 22:39:52 +00:00
Narayan Kamath
dd496ec8b0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3
...
am: 8e168116d0
2016-08-24 22:33:43 +00:00
David Christie
551e6c786f
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
2016-08-24 22:33:41 +00:00
David Christie
187d841b75
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48
...
am: 0777ad8253
2016-08-24 22:33:39 +00:00
David Christie
a6de8f20c7
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619
...
am: 3aaac55e70
2016-08-24 22:33:37 +00:00
David Christie
8aaffd9ebf
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5 am: e24eb2dbb5
...
am: 362668b6f7
2016-08-24 22:30:20 +00:00
Narayan Kamath
8e168116d0
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04
...
am: c01db7dca3
2016-08-24 22:23:54 +00:00
David Christie
735699f3ef
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
2016-08-24 22:23:52 +00:00
David Christie
0777ad8253
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66
...
am: d610363a48
2016-08-24 22:23:49 +00:00
David Christie
3aaac55e70
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d
...
am: dd1016c619
2016-08-24 22:23:46 +00:00
David Christie
362668b6f7
resolve merge conflicts of a2399b4 to mnc-dev am: 6195acc2b5
...
am: e24eb2dbb5
2016-08-24 22:23:42 +00:00
David Christie
e24eb2dbb5
resolve merge conflicts of a2399b4 to mnc-dev
...
am: 6195acc2b5
2016-08-24 22:16:07 +00:00
Narayan Kamath
c01db7dca3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f
...
am: c11e8fcc04
2016-08-24 22:14:36 +00:00
David Christie
3970ee98f7
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
2016-08-24 22:14:32 +00:00
David Christie
d610363a48
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1
...
am: af369f6e66
2016-08-24 22:14:28 +00:00
David Christie
dd1016c619
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
am: 975879a18d
2016-08-24 22:14:24 +00:00
David Christie
6195acc2b5
resolve merge conflicts of a2399b4 to mnc-dev
...
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
2016-08-24 13:47:57 -07:00
Narayan Kamath
5191225400
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67 am: 86437ec433
...
am: 4d7740907e
2016-08-24 20:30:21 +00:00
Narayan Kamath
c11e8fcc04
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753 am: b9fae65605
...
am: c6c7ca0cde
2016-08-24 20:30:13 +00:00
Narayan Kamath
c6ab92e93b
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f
...
am: 3c63bb367f
2016-08-24 20:30:09 +00:00
David Christie
af369f6e66
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
2016-08-24 20:30:06 +00:00
David Christie
975879a18d
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
...
am: 41a0dd41f1
2016-08-24 20:30:01 +00:00
Salvador Martinez
ed004e2958
Merge "Added error handling to settings suggestions list" into nyc-dev
2016-08-24 18:17:40 +00:00
TreeHugger Robot
462f29f77f
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
2016-08-24 17:27:09 +00:00
Salvador Martinez
18bf581c77
Added error handling to settings suggestions list
...
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b83
2016-08-24 16:43:22 +00:00
David Christie
a2399b45e2
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
...
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
2016-08-23 16:19:51 -07:00
Julius D'souza
b2507eb7b7
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours
...
am: d5bf4039a9
2016-08-23 16:52:24 +00:00
Julius D'souza
d5bf4039a9
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
am: 3275a3a5a5
2016-08-23 16:45:41 +00:00
