OSDN Git Service
Mark Lu [Thu, 25 Aug 2016 22:34:27 +0000 (22:34 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5 am:
6df44a80a3
am:
77d7db4de1
Change-Id: I24f5d7c743cc7508a7ac46b6b15262b75178065a
Mark Lu [Thu, 25 Aug 2016 22:34:22 +0000 (22:34 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba am:
5c83071228
am:
7c71a2fa10
Change-Id: I4691c198ee6e207063a9b3bc46f2adebd93b829d
Mark Lu [Thu, 25 Aug 2016 22:34:20 +0000 (22:34 +0000)]
docs: fix broken links in Activity reference am:
fa43485910 am:
497c2907fd
am:
eab610d0a6
Change-Id: Idfc3c5edf2afd5f5b7c60b43a719dad943bcc61c
Mark Lu [Thu, 25 Aug 2016 22:34:17 +0000 (22:34 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84 am:
f858ebf9db
am:
d478856ca8
Change-Id: I84c02c6bdbacc02e8d15bb25fe275c9416ac54b1
Mark Lu [Thu, 25 Aug 2016 22:31:16 +0000 (22:31 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a am:
6f5cf3fb0d
am:
da8624a129
Change-Id: Iae2ec1c67d3a2a32150cad79fa28653d0c7ac085
Hemal Patel [Thu, 25 Aug 2016 22:31:14 +0000 (22:31 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14 am:
a544221abd am:
d6a64d788b
am:
42708fa473
Change-Id: I90c2d41cda51f1e95d84cbfce641085fed533b79
Andrew Solovay [Thu, 25 Aug 2016 22:31:12 +0000 (22:31 +0000)]
docs: Removing non-English /preview/ directories am:
2d629c3e5b am:
847b2a4a95
am:
911c2ce9a7
Change-Id: I6cc208578a23543a73bd066d1f1b9c4984fdce90
Chris Tate [Thu, 25 Aug 2016 22:31:10 +0000 (22:31 +0000)]
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev am:
9141666630
am:
9ff115c3c5
Change-Id: Ic2608c543b1410783eacf426b2f4526a6c630107
Christopher Tate [Thu, 25 Aug 2016 22:31:07 +0000 (22:31 +0000)]
Properly configure live wallpaper selection following restore am:
2471a3724f
am:
7f97482766
Change-Id: Iab39cb5ef8f50728698379a4251513cc405ce129
Mark Lu [Thu, 25 Aug 2016 22:14:19 +0000 (22:14 +0000)]
docs: rewrite one attribute description in R.attr am:
5dabf06ae5
am:
6df44a80a3
Change-Id: I49b1427646f42a1c4799c5237b1bafbee7132367
Mark Lu [Thu, 25 Aug 2016 22:14:17 +0000 (22:14 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev am:
d428a012ba
am:
5c83071228
Change-Id: I86917b1f552202afdef7ad9797da01bbe60110d6
Mark Lu [Thu, 25 Aug 2016 22:14:14 +0000 (22:14 +0000)]
docs: fix broken links in Activity reference am:
fa43485910
am:
497c2907fd
Change-Id: I35f07a633757dc83970accbe78b3173090e71099
Mark Lu [Thu, 25 Aug 2016 22:10:57 +0000 (22:10 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev am:
209fb02f84
am:
f858ebf9db
Change-Id: Ida064f82378b4f10854026ca7b0ac9656dcf4fd6
Mark Lu [Thu, 25 Aug 2016 22:10:53 +0000 (22:10 +0000)]
docs: fix code snippets in SQL Databases page am:
95698f127a
am:
6f5cf3fb0d
Change-Id: I6c7c8fb934a0bde54cc971c724df14bd1575bc38
Hemal Patel [Thu, 25 Aug 2016 22:10:49 +0000 (22:10 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14 am:
a544221abd
am:
d6a64d788b
Change-Id: I52619fde80addd87e0ef18b48bc93184ddf347f1
Andrew Solovay [Thu, 25 Aug 2016 22:10:46 +0000 (22:10 +0000)]
docs: Removing non-English /preview/ directories am:
2d629c3e5b
am:
847b2a4a95
Change-Id: Icc32038d5c08851c19f0a52f6517ee58227f5e8f
Chris Tate [Thu, 25 Aug 2016 22:10:43 +0000 (22:10 +0000)]
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
am:
9141666630
Change-Id: I63dbc9cd941fd976e623d20b01b1e28d127e24e4
Christopher Tate [Thu, 25 Aug 2016 22:10:41 +0000 (22:10 +0000)]
Properly configure live wallpaper selection following restore
am:
2471a3724f
Change-Id: Iddb8fa4a0fad4a1e19e27e576015600a0d4ea905
Mark Lu [Thu, 25 Aug 2016 21:54:54 +0000 (21:54 +0000)]
docs: rewrite one attribute description in R.attr
am:
5dabf06ae5
Change-Id: Iecfe65ca227844627a7122a3a1e5ea6285a31c9a
Mark Lu [Thu, 25 Aug 2016 21:54:51 +0000 (21:54 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev
am:
d428a012ba
Change-Id: Ia79921169d3bf62b0994d663d763f70cda29fe22
Mark Lu [Thu, 25 Aug 2016 21:54:49 +0000 (21:54 +0000)]
docs: fix broken links in Activity reference
am:
fa43485910
Change-Id: I72cebe96e1ea0c1950ca316bc80c337bfdde9002
Mark Lu [Thu, 25 Aug 2016 21:54:44 +0000 (21:54 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
am:
209fb02f84
Change-Id: I805e68de97a5929586b1e2f3d7c4057e1f6f8c50
Mark Lu [Thu, 25 Aug 2016 21:54:42 +0000 (21:54 +0000)]
docs: fix code snippets in SQL Databases page
am:
95698f127a
Change-Id: Iebfe1b54c173dc78a11fd3aa3aca5024b7cbb74e
Hemal Patel [Thu, 25 Aug 2016 21:37:59 +0000 (21:37 +0000)]
Docs: Fixed the Bluetooth guide link am:
65813dff14
am:
a544221abd
Change-Id: I0cbd8fa416f4d0b00d7cb3c65eef9748439abe48
Andrew Solovay [Thu, 25 Aug 2016 21:37:57 +0000 (21:37 +0000)]
docs: Removing non-English /preview/ directories
am:
2d629c3e5b
Change-Id: I499a0148d7ece41b30f83baa34a0efc5c0ec1c82
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
Chris Tate [Thu, 25 Aug 2016 20:58:07 +0000 (20:58 +0000)]
Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
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
Andrew Rossignol [Thu, 25 Aug 2016 19:12:27 +0000 (19:12 +0000)]
Merge "DO NOT MERGE ANYWHERE unlock_wave: replace with black" into cw-f-dev
Andrew Rossignol [Thu, 25 Aug 2016 19:12:08 +0000 (19:12 +0000)]
Merge "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" into cw-f-dev
Tenghui Zhu [Thu, 25 Aug 2016 18:28:34 +0000 (18:28 +0000)]
Merge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into nyc-mr1-dev
am:
1e37cc2f8a
Change-Id: I52cced2d68a82331daa1cb26182b5fff333e2a00
Teng-Hui Zhu [Thu, 25 Aug 2016 18:28:21 +0000 (18:28 +0000)]
Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test.
am:
0a815bb94f
Change-Id: I9b5d851f95349a7c8981ab8868608e21996a1bb5
Tenghui Zhu [Thu, 25 Aug 2016 18:24:09 +0000 (18:24 +0000)]
Merge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into nyc-mr1-dev
Phil Weaver [Thu, 25 Aug 2016 18:09:53 +0000 (18:09 +0000)]
Merge "Revert "Dispatch a11y events in separate thread."" into nyc-mr1-dev
am:
1bb2cc8cc3
Change-Id: I70f9311e0c72d41db43c1a89dc3a8cbc201bc7af
Phil Weaver [Thu, 25 Aug 2016 18:09:50 +0000 (18:09 +0000)]
Revert "Dispatch a11y events in separate thread."
am:
5de2feab26
Change-Id: I0dcc9172c397dd44888de3295e5a34245b122096
Phil Weaver [Thu, 25 Aug 2016 18:05:31 +0000 (18:05 +0000)]
Merge "Revert "Dispatch a11y events in separate thread."" into nyc-mr1-dev
Phil Weaver [Thu, 25 Aug 2016 18:03:18 +0000 (18:03 +0000)]
Merge "Fix crash when user changes after a11yservice dies" into nyc-mr1-dev
am:
a71239203f
Change-Id: I44c837ee4d96868d2a42e89fccaa32c29f606707
Phil Weaver [Thu, 25 Aug 2016 18:03:16 +0000 (18:03 +0000)]
Fix crash when user changes after a11yservice dies
am:
e797b84ed2
Change-Id: I27ad5d23ffa449df05bf72f51a97149db4d9ad58
Phil Weaver [Thu, 25 Aug 2016 17:59:18 +0000 (17:59 +0000)]
Merge "Fix crash when user changes after a11yservice dies" into nyc-mr1-dev
Dianne Hackborn [Thu, 25 Aug 2016 17:22:44 +0000 (17:22 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-mr1-dev
am:
09cb4f2007
Change-Id: I6a35614efdcf81784d067bd7cdb127d08c301b08
Dianne Hackborn [Thu, 25 Aug 2016 17:22:42 +0000 (17:22 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
am:
92aa4b2ba3
Change-Id: I0c44548aad0761dc0c87ac5bd129061e69c39795
Selim Cinek [Thu, 25 Aug 2016 17:22:39 +0000 (17:22 +0000)]
Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev am:
28cb706ee9
am:
e42be8e466
Change-Id: I2aef85b9961294122f565c9ca38c92441bafbdef
Adrian Roos [Thu, 25 Aug 2016 17:22:37 +0000 (17:22 +0000)]
DirectReply: Fix bugs when replying from HUNs am:
190e532c86
am:
13bb1c6403
Change-Id: If283c999f53104d224ddbbce98d58d8e1c7ed402
Dianne Hackborn [Thu, 25 Aug 2016 17:17:34 +0000 (17:17 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-mr1-dev
Selim Cinek [Thu, 25 Aug 2016 17:16:12 +0000 (17:16 +0000)]
Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev
am:
28cb706ee9
Change-Id: I5bd94614143492bd188067b71c4257fe1143b9f8
Adrian Roos [Thu, 25 Aug 2016 17:16:10 +0000 (17:16 +0000)]
DirectReply: Fix bugs when replying from HUNs
am:
190e532c86
Change-Id: I28405e90e386181bdc241ca4b92a22c4974c4b01
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
Selim Cinek [Thu, 25 Aug 2016 17:10:43 +0000 (17:10 +0000)]
Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev
Phil Weaver [Thu, 25 Aug 2016 16:31:25 +0000 (16:31 +0000)]
Revert "Dispatch a11y events in separate thread."
This reverts commit
c34649411d053185b3572c4cd924e6f14295d8cd.
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
Matthew Fritze [Thu, 25 Aug 2016 16:23:20 +0000 (16:23 +0000)]
Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev am:
2db15cdf03
am:
571e1e1948
Change-Id: I262e8fe79a46c400557580c2d2a9c3e276273468
Matthew Fritze [Thu, 25 Aug 2016 16:22:46 +0000 (16:22 +0000)]
Adding flags to allow package names to be sent to support. am:
e1398ea4d9
am:
a95de6b96d
Change-Id: I7ae8b87685d17b7b76b4c097cb3ed6d8fbdaf015
Matthew Fritze [Thu, 25 Aug 2016 16:15:44 +0000 (16:15 +0000)]
Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
am:
2db15cdf03
Change-Id: Ice1734dd0e05a38db1563d96627cd93578d1d5e3
Matthew Fritze [Thu, 25 Aug 2016 16:15:04 +0000 (16:15 +0000)]
Adding flags to allow package names to be sent to support.
am:
e1398ea4d9
Change-Id: I2c459d9467fada537bafd6d780e12f8ba7a082fc
Matthew Fritze [Thu, 25 Aug 2016 16:10:22 +0000 (16:10 +0000)]
Merge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
Andrew Scull [Thu, 25 Aug 2016 15:06:35 +0000 (15:06 +0000)]
Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev
am:
56bfc1cecf
Change-Id: Iac52aa634022bcb63e5096f6e1da82bfaeba4240
Andrew Scull [Thu, 25 Aug 2016 15:06:33 +0000 (15:06 +0000)]
Explain the IAE thrown by resetPassword.
am:
60df33da54
Change-Id: Ia827b77a55544f6e815e13a86256ebcb80aea326
Andrew Scull [Thu, 25 Aug 2016 15:01:16 +0000 (15:01 +0000)]
Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev
Andrew Scull [Thu, 25 Aug 2016 14:54:38 +0000 (14:54 +0000)]
Merge "Only check password length for relevant qualities." into nyc-mr1-dev
am:
b038c4f617
Change-Id: I92932ae593d7c95cd4c6458fb69f716ab3f8c41f
Andrew Scull [Thu, 25 Aug 2016 14:54:36 +0000 (14:54 +0000)]
Only check password length for relevant qualities.
am:
83ab85410b
Change-Id: I89354ab06c70fd7b23d32aeebf84df85f6375765
Andrew Scull [Thu, 25 Aug 2016 14:50:27 +0000 (14:50 +0000)]
Merge "Only check password length for relevant qualities." into nyc-mr1-dev
Lorenzo Colitti [Thu, 25 Aug 2016 09:30:16 +0000 (09:30 +0000)]
Support notifying network switches via notifications and toasts. am:
5526f9c78c
am:
4549d8b4aa
Change-Id: I73ac89b4f2c473d22fac80753dd6443c73892956
Lorenzo Colitti [Thu, 25 Aug 2016 09:23:55 +0000 (09:23 +0000)]
Support notifying network switches via notifications and toasts.
am:
5526f9c78c
Change-Id: Ic02fac6264e6f2aeda6ee1313884e3bfa4f7237b
Lorenzo Colitti [Mon, 22 Aug 2016 07:46:40 +0000 (16:46 +0900)]
Support notifying network switches via notifications and toasts.
Bug:
31025214
Change-Id: If1578f422f38a1dcfaec529882aed01ae5e8d53c
Michael Kwan [Thu, 18 Aug 2016 22:16:41 +0000 (15:16 -0700)]
Add missing screen bucket for screen percentage for round screens.
Change-Id: I32b257f164a85e6da627c8a9c1d918f0271db293
Michael Kwan [Thu, 25 Aug 2016 06:06:05 +0000 (06:06 +0000)]
Merge "Add offset to round screens when an AlertDialog list item is shown." into cw-f-dev
Andrew Rossignol [Thu, 25 Aug 2016 04:53:01 +0000 (21:53 -0700)]
DO NOT MERGE ANYWHERE unlock_wave: replace with black
The unlock_wave asset is used by an internal widget that does not appear
to be used by Android Wear. This asset can be removed to save sapce on
the system partition. It is replaced with black PNGs in the event that
it is loaded and something in frameworks expects these files to be
present.
The black replacements are just a few kB compared to the hundreds of kB
of the original copies.
Bug:
28215770
Change-Id: Ie70f5013c48dbe0bde25992c64ca5023ae37b604
Andrew Rossignol [Thu, 25 Aug 2016 04:13:19 +0000 (21:13 -0700)]
DO NOT MERGE ANYWHERE default_wallpaper: replace with black
The default_wallpaper is not displayed on Android Wear devices and it
can be removed to save space on the system partition. It is replaced
with black PNGs in the event that it is loaded and something in
frameworks expects these files to be present.
The black replacements are just a few kB compared to the few MB of the
original copies.
Bug:
28215770
Change-Id: Ie5327c5f32f16dad4bdc9c09ef8a1efa850f3ae8
Matthew Fritze [Wed, 24 Aug 2016 23:53:50 +0000 (16:53 -0700)]
Adding flags to allow package names to be sent to support.
Bug:
30924073
Change-Id: I9ec0a90a178adb72da3d4a426e75a79315832bf6
Tests: Manual.
Svetoslav Ganov [Thu, 25 Aug 2016 02:25:49 +0000 (02:25 +0000)]
Merge "Store the event of settings db downgrade" into nyc-mr1-dev
am:
49af952a92
Change-Id: Ib16ac3832894ae502e1cd9464f16ca4468b1ef22
Svetoslav Ganov [Thu, 25 Aug 2016 02:25:47 +0000 (02:25 +0000)]
Store the event of settings db downgrade
am:
264c7a90c7
Change-Id: I5b9d5a9bd3c2df337776921a34960ceef8fda1ce
TreeHugger Robot [Thu, 25 Aug 2016 02:18:08 +0000 (02:18 +0000)]
Merge "Store the event of settings db downgrade" into nyc-mr1-dev
Narayan Kamath [Thu, 25 Aug 2016 01:56:29 +0000 (01:56 +0000)]
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
am:
483ac072f3
Change-Id: I7c049debc93efe51287512bcc9a582b4df734358
David Christie [Thu, 25 Aug 2016 01:56:25 +0000 (01:56 +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 am:
12eba9155f
am:
5e27b035a9
Change-Id: I91cb61c983cce5570e3e11312dcfc68d144ef5cb
David Christie [Thu, 25 Aug 2016 01:56:20 +0000 (01:56 +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 am:
5c1f2950a1
am:
9338328240
Change-Id: If721f518fdbb63d66a265e8635c01f3049419938
David Christie [Thu, 25 Aug 2016 01:46:27 +0000 (01:46 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70 am:
a6de8f20c7 am:
00e1e39ae2 am:
4f1d1fc92d am:
7e621ca1ec
am:
d2929041cc
Change-Id: I8e9b185ba3b6a089c34aac60caf5f3de2dbc1fc8
Narayan Kamath [Thu, 25 Aug 2016 01:45:42 +0000 (01:45 +0000)]
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
David Christie [Thu, 25 Aug 2016 01:45:39 +0000 (01:45 +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
am:
12eba9155f
Change-Id: I289975ed3c1efaab6182efff883c259e3ea7e727
David Christie [Thu, 25 Aug 2016 01:45:36 +0000 (01:45 +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
am:
5c1f2950a1
Change-Id: Ibfff105106c26622813fad21fad8401eaea0f846
Doris Ling [Thu, 25 Aug 2016 01:39:42 +0000 (01:39 +0000)]
Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev am:
05c9124423
am:
c5ce3a384f
Change-Id: I8ec450f950b51f6a0fb875dc212efd5d5aa6cd96
Doris Ling [Thu, 25 Aug 2016 01:39:39 +0000 (01:39 +0000)]
Add the Moves setting values to the backup list. am:
8a33273620
am:
cdc758d555
Change-Id: I8fd42b0b5e9f9471a659f6ae0205482ad0c800e8
David Christie [Thu, 25 Aug 2016 01:39:34 +0000 (01:39 +0000)]
resolve merge conflicts of
8aaffd9 to nyc-dev am:
36246a43e5 am:
ae6bd11a4b
am:
7f95d80157
Change-Id: If4684883d98ed579b594bfc735d3dea5bbf403c4
David Christie [Thu, 25 Aug 2016 01:39:31 +0000 (01:39 +0000)]
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
Narayan Kamath [Thu, 25 Aug 2016 01:32:22 +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: I4e3b2bcddde4e7441585931c4c595769ee22eea5
David Christie [Thu, 25 Aug 2016 01:32:17 +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: Ie9163487b07aaf888b94781fbb281deccaccf0a5
David Christie [Thu, 25 Aug 2016 01:32:10 +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: I01778e8f2a71521a931b49508fc1f88353a10cc8
David Christie [Thu, 25 Aug 2016 01:32:05 +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: Idf472158bd5f9ea71b2de4b0a782a92736ca7d64
Doris Ling [Thu, 25 Aug 2016 01:31:30 +0000 (01:31 +0000)]
Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev
am:
05c9124423
Change-Id: I1fea441dda3a2b75aa8bdc6826939c80b8068280
Doris Ling [Thu, 25 Aug 2016 01:31:28 +0000 (01:31 +0000)]
Add the Moves setting values to the backup list.
am:
8a33273620
Change-Id: I8f64074acbe6d85a0f2402695925e7f75c20569b
David Christie [Thu, 25 Aug 2016 01:31:25 +0000 (01:31 +0000)]
resolve merge conflicts of
8aaffd9 to nyc-dev am:
36246a43e5
am:
ae6bd11a4b
Change-Id: I454888b9d50e829a9166414efa9e4914e2dc12c5
TreeHugger Robot [Thu, 25 Aug 2016 01:26:10 +0000 (01:26 +0000)]
Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev
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:30 +0000 (01:25 +0000)]
resolve merge conflicts of
8aaffd9 to nyc-dev
am:
36246a43e5
Change-Id: Ic91baff73ef9e5ffe304d10a5a55e8476dfcfecb
Doris Ling [Wed, 24 Aug 2016 22:05:43 +0000 (15:05 -0700)]
Add the Moves setting values to the backup list.
Add Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,
Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, and
Secure.SYSTEM_NAVIGATION_KEYS_ENABLED (used by Settings->Moves)
to Secure.SETTINGS_TO_BACKUP, so that they will be backed up and
restored automatically.
Fixes:
31023788
Test: Manual - Setup device using "Copy your data", verify that
Settings->Moves toggles are set to previous selected values.
Change-Id: I509c997641bb693009bec703e5272b5aad517f0f
Svetoslav Ganov [Thu, 25 Aug 2016 00:31:14 +0000 (17:31 -0700)]
Store the event of settings db downgrade
bug:
30561721
Change-Id: I8f2252bbf99603976c7efc32c54aa88b314ba815
Phil Weaver [Thu, 25 Aug 2016 00:04:59 +0000 (17:04 -0700)]
Fix crash when user changes after a11yservice dies
We were failing to create a death link for the service that
replaces the crashed a11y service. Adding an invariant that
mService is always linked to death if it is non-null.
Bug:
31044551
Change-Id: I98b6a3969cfacb0309e19938899a51c809249d6b