Mark Lu
6df44a80a3
docs: rewrite one attribute description in R.attr
...
am: 5dabf06ae5
Change-Id: Iecfe65ca227844627a7122a3a1e5ea6285a31c9a
2016-08-25 21:54:54 +00:00
Mark Lu
5c83071228
Merge "docs: fix broken links in Activity reference" into nyc-dev
...
am: d428a012ba
Change-Id: Ia79921169d3bf62b0994d663d763f70cda29fe22
2016-08-25 21:54:51 +00:00
Mark Lu
497c2907fd
docs: fix broken links in Activity reference
...
am: fa43485910
Change-Id: I72cebe96e1ea0c1950ca316bc80c337bfdde9002
2016-08-25 21:54:49 +00:00
Mark Lu
f858ebf9db
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
...
am: 209fb02f84
Change-Id: I805e68de97a5929586b1e2f3d7c4057e1f6f8c50
2016-08-25 21:54:44 +00:00
Mark Lu
6f5cf3fb0d
docs: fix code snippets in SQL Databases page
...
am: 95698f127a
Change-Id: Iebfe1b54c173dc78a11fd3aa3aca5024b7cbb74e
2016-08-25 21:54:42 +00:00
Dirk Dougherty
b5760c1fe7
Fetch ga script over https to avoid mixed content.
...
Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43
2016-08-25 14:50:54 -07: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
Hemal Patel
d6a64d788b
Docs: Fixed the Bluetooth guide link am: 65813dff14
...
am: a544221abd
Change-Id: I0cbd8fa416f4d0b00d7cb3c65eef9748439abe48
2016-08-25 21:37:59 +00:00
Andrew Solovay
847b2a4a95
docs: Removing non-English /preview/ directories
...
am: 2d629c3e5b
Change-Id: I499a0148d7ece41b30f83baa34a0efc5c0ec1c82
2016-08-25 21:37:57 +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
Change-Id: I4502828940c4f2e33363e10728e97f484bc15651
2016-08-25 21:31:56 +00:00
Chris Tate
9141666630
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
2016-08-25 20:58:09 +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
Pablo Ceballos
aff2f94939
Fail createVirtualDisplay with single-buffered Surface
...
Bug 30106031
Change-Id: I434df329eb3c162dd9ef01245ac5e0da97216e70
2016-08-25 12:06:52 -07:00
Tenghui Zhu
1e37cc2f8a
Merge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into nyc-mr1-dev
2016-08-25 18:24:12 +00:00
Phil Weaver
1bb2cc8cc3
Merge "Revert "Dispatch a11y events in separate thread."" into nyc-mr1-dev
2016-08-25 18:05:36 +00:00
Phil Weaver
a71239203f
Merge "Fix crash when user changes after a11yservice dies" into nyc-mr1-dev
2016-08-25 17:59:20 +00:00
Dianne Hackborn
09cb4f2007
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-mr1-dev
2016-08-25 17:17:36 +00:00
Selim Cinek
e42be8e466
Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev
...
am: 28cb706ee9
Change-Id: I5bd94614143492bd188067b71c4257fe1143b9f8
2016-08-25 17:16:12 +00:00
Adrian Roos
13bb1c6403
DirectReply: Fix bugs when replying from HUNs
...
am: 190e532c86
Change-Id: I28405e90e386181bdc241ca4b92a22c4974c4b01
2016-08-25 17:16:10 +00:00
Dianne Hackborn
92aa4b2ba3
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
2016-08-25 10:12:02 -07:00
Selim Cinek
28cb706ee9
Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev
2016-08-25 17:10:45 +00:00
Phil Weaver
5de2feab26
Revert "Dispatch a11y events in separate thread."
...
This reverts commit c34649411d .
Dispatching accessibility events in their own thread is causing Chrome and gmail to crash. We've identified two issues: Chrome is allocating strings natively using references that aren't valid outside of their thread, and the text is being set to values that are changed in the UI thread.
I'm going to resolve these issues on master by making deep copies of the strings, but that change will have its own performance implications.
Since we were bit almost immediately by an unexpected result of this change, and I need to erode its benefit by making deep copies, I think it's a bad bet to push it into MR1.
Bug: 31042124
Change-Id: I6f5c225a9197036db43fd0ac6008447b22617525
2016-08-25 16:31:25 +00:00
Tyler Gunn
06f3fa66b7
Update InCallService#onConnectionEvent comments.
...
Update comments to indicate the method is unused and to point developers
to the correct method.
Bug: 31056610
Change-Id: I5d1da69914e0fccd3cf3c504b68acbcf0c70c9c4
2016-08-25 09:26:15 -07:00
Matthew Fritze
571e1e1948
Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
...
am: 2db15cdf03
Change-Id: Ice1734dd0e05a38db1563d96627cd93578d1d5e3
2016-08-25 16:15:44 +00:00
Matthew Fritze
a95de6b96d
Adding flags to allow package names to be sent to support.
...
am: e1398ea4d9
Change-Id: I2c459d9467fada537bafd6d780e12f8ba7a082fc
2016-08-25 16:15:04 +00:00
Matthew Fritze
2db15cdf03
Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
2016-08-25 16:10:26 +00:00
Andrew Scull
56bfc1cecf
Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev
2016-08-25 15:01:18 +00:00
Andrew Scull
b038c4f617
Merge "Only check password length for relevant qualities." into nyc-mr1-dev
2016-08-25 14:50:29 +00:00
Narayan Kamath
1fbc4b8624
resolve merge conflicts of 5191225 to mnc-dev
...
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
2016-08-25 10:43:25 +01:00
Lorenzo Colitti
efe0839876
Show a toast when switching from wifi to Verizon cell data.
...
Bug: 31025214
Change-Id: Id7ebb878521efb26995bce9ecdf84f87e0074209
2016-08-25 18:30:54 +09:00
Lorenzo Colitti
4549d8b4aa
Support notifying network switches via notifications and toasts.
...
am: 5526f9c78c
Change-Id: Ic02fac6264e6f2aeda6ee1313884e3bfa4f7237b
2016-08-25 09:23:55 +00:00
Lorenzo Colitti
5526f9c78c
Support notifying network switches via notifications and toasts.
...
Bug: 31025214
Change-Id: If1578f422f38a1dcfaec529882aed01ae5e8d53c
2016-08-25 18:14:18 +09:00
Erik Kline
c1bc0be161
Add simple NetdService util class
...
Hopefully we can avoid a small amount of repeated wrapper code.
Bug: 21859053
Bug: 28135208
Change-Id: I00f404f19c14a1726071e62e558f551dccf8b915
2016-08-25 16:25:39 +09:00
Matthew Fritze
e1398ea4d9
Adding flags to allow package names to be sent to support.
...
Bug: 30924073
Change-Id: I9ec0a90a178adb72da3d4a426e75a79315832bf6
Tests: Manual.
2016-08-25 02:57:01 +00:00
TreeHugger Robot
49af952a92
Merge "Store the event of settings db downgrade" into nyc-mr1-dev
2016-08-25 02:18:11 +00:00
Paul Jensen
7d2198b586
Avoid crashing when downloading MitM'd PAC that is too big
...
There's two pieces to this fix:
1. Move PAC loading off IoThread which isn't meant for
blocking network fetches. If the fetch takes more than
60s Android reboots when the IoThread is used.
2. Limit PAC fetching to 20MB. Any PAC bigger than that
is likely evil.
MitM of PACs should only be possbile when a non-SSL PAC URL
is used.
Change-Id: Ie1658a1c705615dc85a7fc68053f0dad8d048294
Fixes: 30100884
2016-08-25 02:09:37 +00:00
Narayan Kamath
483ac072f3
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0 am: 472a7792f3 am: 77a9ef952c
...
am: 627ff45065
Change-Id: Ica51b6e1d52c5276577c16c96a21a238084842a8
2016-08-25 01:45:42 +00:00
David Christie
5e27b035a9
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
...
am: 12eba9155f
Change-Id: I289975ed3c1efaab6182efff883c259e3ea7e727
2016-08-25 01:45:39 +00:00
David Christie
9338328240
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
...
am: 5c1f2950a1
Change-Id: Ibfff105106c26622813fad21fad8401eaea0f846
2016-08-25 01:45:36 +00:00
David Christie
d2929041cc
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 am: 00e1e39ae2 am: 4f1d1fc92d
...
am: 7e621ca1ec
Change-Id: Ib1861ff82ed68f82d5f2c9868adc693b2ff1c617
2016-08-25 01:39:31 +00:00
Narayan Kamath
627ff45065
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: I4e3b2bcddde4e7441585931c4c595769ee22eea5
2016-08-25 01:32:22 +00:00
David Christie
12eba9155f
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: Ie9163487b07aaf888b94781fbb281deccaccf0a5
2016-08-25 01:32:17 +00:00
David Christie
5c1f2950a1
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: I01778e8f2a71521a931b49508fc1f88353a10cc8
2016-08-25 01:32:10 +00:00
David Christie
7e621ca1ec
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 am: 00e1e39ae2
...
am: 4f1d1fc92d
Change-Id: Idf472158bd5f9ea71b2de4b0a782a92736ca7d64
2016-08-25 01:32:05 +00:00
Doris Ling
c5ce3a384f
Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev
...
am: 05c9124423
Change-Id: I1fea441dda3a2b75aa8bdc6826939c80b8068280
2016-08-25 01:31:30 +00:00