OSDN Git Service
Amith Yamasani [Fri, 26 Aug 2016 00:03:08 +0000 (00:03 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours am:
4a3caefd6c
am:
f7259775d8
Change-Id: Id44100a4e6dd89183f445b3f8f347b127e811d01
Sudheer Shanka [Fri, 26 Aug 2016 00:03:05 +0000 (00:03 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2
am:
12a668fde8
Change-Id: I8c3c930cdb6dff867e0803c60726ae44c330179d
Sudheer Shanka [Thu, 25 Aug 2016 23:56:58 +0000 (23:56 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours am:
6a9490f850
am:
380d9b9486
Change-Id: I0d694e2d3025c5b4474530acc89efa904832cf3f
Amith Yamasani [Thu, 25 Aug 2016 23:56:54 +0000 (23:56 +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
am:
fda97bed8d
Change-Id: Ifff4d1bafd76ccb3216a84f8607f2f8bbc65cfa3
Amith Yamasani [Thu, 25 Aug 2016 23:56:51 +0000 (23:56 +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
am:
b6813f24ae
Change-Id: I6dc5805f34b81bc988c4158cac09c04e5b5b9609
Mark Goldstein [Thu, 25 Aug 2016 23:56:49 +0000 (23:56 +0000)]
Merge "docs: Fix typo" into nyc-dev am:
8d660eebad
am:
e24079f5b2
Change-Id: I8316a53f8cbcc367e5cfa43151ea68bb11591720
Mark Goldstein [Thu, 25 Aug 2016 23:56:45 +0000 (23:56 +0000)]
docs: Fix typo am:
1c22ae296b
am:
b348093ec4
Change-Id: Ia4e3200d698bf4687b788d31e40dfcb61c3ecd18
Amith Yamasani [Thu, 25 Aug 2016 23:49:28 +0000 (23:49 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours
am:
4a3caefd6c
Change-Id: I46bfb961a022dc383510d9189b4de2dfa91dde9d
Sudheer Shanka [Thu, 25 Aug 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours" into nyc-dev
am:
555fbf30d2
Change-Id: I03d222633c7a276b889035faf900e2fa66f7289f
Sudheer Shanka [Thu, 25 Aug 2016 23:49:14 +0000 (23:49 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours
am:
6a9490f850
Change-Id: I51c3762d21c30d091d33e79b83b4f09dfdf72d19
Amith Yamasani [Thu, 25 Aug 2016 23:49:03 +0000 (23:49 +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: Ifb42c3e05317e63ed428e1f542a691dacfb187a8
Amith Yamasani [Thu, 25 Aug 2016 23:49:01 +0000 (23:49 +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: I589b676604afc0e728d2aa7c7616f53698aec900
Mark Goldstein [Thu, 25 Aug 2016 23:48:49 +0000 (23:48 +0000)]
Merge "docs: Fix typo" into nyc-dev
am:
8d660eebad
Change-Id: I4df576fd0f070c4104ff83498eca20987c6a7b07
Mark Goldstein [Thu, 25 Aug 2016 23:48:46 +0000 (23:48 +0000)]
docs: Fix typo
am:
1c22ae296b
Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:16 +0000 (23:41 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours" into nyc-dev
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
Narayan Kamath [Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5 am:
1238ffcd2c
am:
22585d75f9
Change-Id: Ibd2d78486d75934c5c99ccede94e5ced5776e4bf
Amith Yamasani [Thu, 25 Aug 2016 23:39:49 +0000 (23:39 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca
am:
7586e03e06 -s ours
Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5
Sudheer Shanka [Thu, 25 Aug 2016 23:39:41 +0000 (23:39 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa
am:
bc5775c18b -s ours
Change-Id: Iabe2db5b615a67130bffceca1801fd5ee9749ba0
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
Narayan Kamath [Thu, 25 Aug 2016 23:35:41 +0000 (23:35 +0000)]
resolve merge conflicts of
5191225 to mnc-dev am:
1fbc4b8624 am:
8f4f9e4d5e am:
a21569cd76 am:
b0429bbad5
am:
1238ffcd2c
Change-Id: I4fa223dc0d1e1beeb6d9a8a7dfd1181efe473a90
Amith Yamasani [Thu, 25 Aug 2016 23:29:59 +0000 (23:29 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41
am:
f6361752ca
Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85
Sudheer Shanka [Thu, 25 Aug 2016 23:29:56 +0000 (23:29 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e
am:
2f664374fa
Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402
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:10 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e
am:
75c7391a41
Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea
Sudheer Shanka [Thu, 25 Aug 2016 23:22:04 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb
am:
2490679d7e
Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254
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
Svetoslav Ganov [Thu, 25 Aug 2016 23:14:22 +0000 (23:14 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours
am:
9080d4462e
Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours
am:
86ac88ccdb
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562
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:51 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec
am:
7b8140652b -s ours
Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6
am:
26bb7bf86c -s ours
Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61
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
Pankaj Kanwar [Thu, 25 Aug 2016 22:53:36 +0000 (22:53 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
am:
5d06597072
Change-Id: Iaa541e5454184d047ea75548c480953ec2f7bbc3
Lorenzo Colitti [Thu, 25 Aug 2016 22:53:31 +0000 (22:53 +0000)]
Show a toast when switching from wifi to Verizon cell data.
am:
efe0839876
Change-Id: Iaacca358e70216f18a2f1ee98e717b301e918881
Svet Ganov [Thu, 25 Aug 2016 22:40:52 +0000 (15:40 -0700)]
Fix a regression in sync manager
A previous change introduced the regression that we don't let
initialization syncs run - this reverts the original logic.
bug:
31056110
Change-Id: I4382af1284a3296c63ab773aa4a52df01deeb853
Pankaj Kanwar [Thu, 25 Aug 2016 22:34:20 +0000 (22:34 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
Dianne Hackborn [Thu, 25 Aug 2016 22:17:31 +0000 (22:17 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev am:
184edd6d93
am:
90a6799951
Change-Id: I6509659f0ff94241ca54e908899a49d1915ee7df
Dianne Hackborn [Thu, 25 Aug 2016 22:14:27 +0000 (22:14 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet. am:
dd28b7b5f3
am:
05775d71e6
Change-Id: I4bc69cc57aead92c2fbd9df6ba7e7801e5923f34
Mark Lu [Thu, 25 Aug 2016 22:14:23 +0000 (22:14 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am:
30cba33a60
am:
40f25f1464
Change-Id: I74ffb8ba9687628d4f47ac441676f505cadb53bd
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
Dianne Hackborn [Thu, 25 Aug 2016 21:55:03 +0000 (21:55 +0000)]
Merge "Try to mitigate issue #
31016187: system_server crash in ArraySet." into nyc-dev
am:
184edd6d93
Change-Id: If28d6368a58a6d113e13a0f5b1a4f43d4f4a3d2d
Dianne Hackborn [Thu, 25 Aug 2016 21:55:01 +0000 (21:55 +0000)]
Try to mitigate issue #
31016187: system_server crash in ArraySet.
am:
dd28b7b5f3
Change-Id: I5526e96aa56d3a845f4989f08d30fd07d7a1d70b
Mark Lu [Thu, 25 Aug 2016 21:54:56 +0000 (21:54 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
am:
30cba33a60
Change-Id: Ide4ff7c35d90dcb746b2f6f626d600fa97810801
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
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
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: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
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
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
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:05:31 +0000 (18:05 +0000)]
Merge "Revert "Dispatch a11y events in separate thread."" into nyc-mr1-dev
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: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: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:01:16 +0000 (15:01 +0000)]
Merge "Explain the IAE thrown by resetPassword." into nyc-mr1-dev
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
Narayan Kamath [Thu, 25 Aug 2016 09:43:25 +0000 (10:43 +0100)]
resolve merge conflicts of
5191225 to mnc-dev
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
Lorenzo Colitti [Wed, 24 Aug 2016 09:39:57 +0000 (18:39 +0900)]
Show a toast when switching from wifi to Verizon cell data.
Bug:
31025214
Change-Id: Id7ebb878521efb26995bce9ecdf84f87e0074209
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
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.
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: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
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
OSDN Git Service
