OSDN Git Service

android-x86/frameworks-base.git
7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Fri, 26 Aug 2016 00:04:26 +0000 (00:04 +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
am: 1c6048e697

Change-Id: I38d397eeedce38abd266b6bcd38a7d58ca6e3b74

7 years agoMerge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2
Mark Goldstein [Fri, 26 Aug 2016 00:04:22 +0000 (00:04 +0000)]
Merge "docs: Fix typo" into nyc-dev am: 8d660eebad am: e24079f5b2
am: b354b01acf

Change-Id: Idd3f6aaab7fd040008ea3dbd9f0d45586d99c375

7 years agodocs: Fix typo am: 1c22ae296b am: b348093ec4
Mark Goldstein [Fri, 26 Aug 2016 00:04:18 +0000 (00:04 +0000)]
docs: Fix typo am: 1c22ae296b am: b348093ec4
am: 60a849ab32

Change-Id: I58f80277c0b6230d4b88d113c3c0606cd8f986e7

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
Narayan Kamath [Thu, 25 Aug 2016 23:56:52 +0000 (23:56 +0000)]
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5 am: 1238ffcd2c am: 22585d75f9
am: 36b9c90299

Change-Id: I4cc808652e59fa2fca50b3777bb402d5a4d55335

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoMerge "docs: Fix typo" into nyc-dev am: 8d660eebad
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

7 years agodocs: Fix typo am: 1c22ae296b
Mark Goldstein [Thu, 25 Aug 2016 23:56:45 +0000 (23:56 +0000)]
docs: Fix typo am: 1c22ae296b
am: b348093ec4

Change-Id: Ia4e3200d698bf4687b788d31e40dfcb61c3ecd18

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoMerge "docs: Fix typo" into nyc-dev
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

7 years agodocs: Fix typo
Mark Goldstein [Thu, 25 Aug 2016 23:48:46 +0000 (23:48 +0000)]
docs: Fix typo
am: 1c22ae296b

Change-Id: I9f7f4389583eedbae2df7554f974d49ebe4b9c1e

7 years agoMerge "docs: Fix typo" into nyc-dev
Mark Goldstein [Thu, 25 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "docs: Fix typo" into nyc-dev

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
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

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
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

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
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

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
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

7 years agoMerge "Fix a regression in sync manager" into nyc-mr1-dev
Svetoslav Ganov [Thu, 25 Aug 2016 23:21:05 +0000 (23:21 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev
am: 6f1955bf23

Change-Id: I34edacf49f94d6e994aaa749ee451225c28cfb54

7 years agoFix a regression in sync manager
Svet Ganov [Thu, 25 Aug 2016 23:20:58 +0000 (23:20 +0000)]
Fix a regression in sync manager
am: dfed1c73ec

Change-Id: Ib9317b1a80836b9162a443dfa06c73b4ba1f8337

7 years agoMerge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1...
Pankaj Kanwar [Thu, 25 Aug 2016 23:20:51 +0000 (23:20 +0000)]
Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am: 5d06597072
am: a65318a290

Change-Id: I394091aab4375c0cbbdc2d65f85178e62ac89463

7 years agoShow a toast when switching from wifi to Verizon cell data. am: efe0839876
Lorenzo Colitti [Thu, 25 Aug 2016 23:20:48 +0000 (23:20 +0000)]
Show a toast when switching from wifi to Verizon cell data. am: efe0839876
am: 88d4d15d52

Change-Id: I0d4a6826adaa2e7a17a152d5240b5331c38820d0

7 years agoMerge "Fix a regression in sync manager" into nyc-mr1-dev
Svetoslav Ganov [Thu, 25 Aug 2016 23:14:22 +0000 (23:14 +0000)]
Merge "Fix a regression in sync manager" into nyc-mr1-dev

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
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

7 years agoresolve merge conflicts of 5191225 to mnc-dev
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

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
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

7 years agoMerge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
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

7 years agoShow a toast when switching from wifi to Verizon cell data.
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

7 years agoFix a regression in sync manager
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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc...
Dianne Hackborn [Thu, 25 Aug 2016 22:43:44 +0000 (22:43 +0000)]
Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev am: 184edd6d93 am: 90a6799951
am: 22ad9a3116

Change-Id: If77340cf08148afaf8ad61ae5e0bef299948958e

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet. am: dd28b7b5f3...
Dianne Hackborn [Thu, 25 Aug 2016 22:43:42 +0000 (22:43 +0000)]
Try to mitigate issue #31016187: system_server crash in ArraySet. am: dd28b7b5f3 am: 05775d71e6
am: 2eb6e503ea

Change-Id: I76ecb94f695405dd9938680cdb31a86b8d3411a2

7 years agoMerge "docs: rewrite one attribute description in R.attr" into nyc-dev am: 30cba33a60...
Mark Lu [Thu, 25 Aug 2016 22:34:31 +0000 (22:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev am: 30cba33a60 am: 40f25f1464
am: 794b9dd366

Change-Id: I5abd01756908d9a0bf8763855f89e8ef005ee1c0

7 years agodocs: rewrite one attribute description in R.attr am: 5dabf06ae5 am: 6df44a80a3
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

7 years agoMerge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
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

7 years agoMerge "docs: fix broken links in Activity reference" into nyc-dev am: d428a012ba...
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

7 years agodocs: fix broken links in Activity reference am: fa43485910 am: 497c2907fd
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

7 years agoMerge "docs: fix code snippets in SQL Databases page" into nyc-dev am: 209fb02f84...
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

7 years agodocs: fix code snippets in SQL Databases page am: 95698f127a am: 6f5cf3fb0d
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

7 years agoDocs: Fixed the Bluetooth guide link am: 65813dff14 am: a544221abd am: d6a64d788b
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

7 years agodocs: Removing non-English /preview/ directories am: 2d629c3e5b am: 847b2a4a95
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

7 years agoMerge "Properly configure live wallpaper selection following restore" into nyc-dr1...
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

7 years agoProperly configure live wallpaper selection following restore am: 2471a3724f
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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc...
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

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet. am: dd28b7b5f3
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

7 years agoMerge "docs: rewrite one attribute description in R.attr" into nyc-dev am: 30cba33a60
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

7 years agodocs: rewrite one attribute description in R.attr am: 5dabf06ae5
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

7 years agoMerge "docs: fix broken links in Activity reference" into nyc-dev am: d428a012ba
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

7 years agodocs: fix broken links in Activity reference am: fa43485910
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

7 years agoMerge "docs: fix code snippets in SQL Databases page" into nyc-dev am: 209fb02f84
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

7 years agodocs: fix code snippets in SQL Databases page am: 95698f127a
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

7 years agoDocs: Fixed the Bluetooth guide link am: 65813dff14 am: a544221abd
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

7 years agodocs: Removing non-English /preview/ directories am: 2d629c3e5b
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

7 years agoMerge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
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

7 years agoProperly configure live wallpaper selection following restore
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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev
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

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet.
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

7 years agoMerge "docs: rewrite one attribute description in R.attr" into nyc-dev
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

7 years agodocs: rewrite one attribute description in R.attr
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

7 years agoMerge "docs: fix broken links in Activity reference" into nyc-dev
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

7 years agodocs: fix broken links in Activity reference
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

7 years agoMerge "docs: fix code snippets in SQL Databases page" into nyc-dev
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

7 years agodocs: fix code snippets in SQL Databases page
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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev
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

7 years agoDocs: Fixed the Bluetooth guide link am: 65813dff14
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

7 years agodocs: Removing non-English /preview/ directories
Andrew Solovay [Thu, 25 Aug 2016 21:37:57 +0000 (21:37 +0000)]
docs: Removing non-English /preview/ directories
am: 2d629c3e5b

Change-Id: I499a0148d7ece41b30f83baa34a0efc5c0ec1c82

7 years agoMerge "docs: rewrite one attribute description in R.attr" 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

7 years agoMerge "docs: fix broken links in Activity reference" 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

7 years agoMerge "docs: fix code snippets in SQL Databases page" 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

7 years agoDocs: Fixed the Bluetooth guide link
Hemal Patel [Thu, 25 Aug 2016 21:31:56 +0000 (21:31 +0000)]
Docs: Fixed the Bluetooth guide link
am: 65813dff14

Change-Id: I4502828940c4f2e33363e10728e97f484bc15651

7 years agoMerge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev
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

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet.
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)

7 years agodocs: Fix typo
Mark Goldstein [Thu, 25 Aug 2016 19:48:07 +0000 (12:48 -0700)]
docs: Fix typo

Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7

7 years agodocs: Removing non-English /preview/ directories
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

7 years agoMerge "DO NOT MERGE ANYWHERE unlock_wave: replace with black" into cw-f-dev
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

7 years agoMerge "DO NOT MERGE ANYWHERE default_wallpaper: 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

7 years agoMerge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into...
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

7 years agoAdd TestApi to ValueAnimator for AnimationScaleListDrawable CTS test.
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

7 years agoMerge "Add TestApi to ValueAnimator for AnimationScaleListDrawable CTS test." into...
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

7 years agoMerge "Revert "Dispatch a11y events in separate thread."" 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

7 years agoRevert "Dispatch a11y events in separate thread."
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

7 years agoMerge "Revert "Dispatch a11y events in separate thread."" 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

7 years agoMerge "Fix crash when user changes after a11yservice dies" 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

7 years agoFix crash when user changes after a11yservice dies
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

7 years agoMerge "Fix crash when user changes after a11yservice dies" 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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc...
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

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet.
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

7 years agoMerge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev am: 28cb706ee9
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

7 years agoDirectReply: Fix bugs when replying from HUNs am: 190e532c86
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

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc...
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

7 years agoMerge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-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

7 years agoDirectReply: Fix bugs when replying from HUNs
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

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet.
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

7 years agoMerge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev
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

7 years agoRevert "Dispatch a11y events in separate thread."
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

7 years agoMerge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev...
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

7 years agoAdding flags to allow package names to be sent to support. am: e1398ea4d9
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

7 years agoMerge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
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

7 years agoAdding flags to allow package names to be sent to support.
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

7 years agoMerge "Adding flags to allow package names to be sent to support." into nyc-dr1-dev
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