Dirk Dougherty
c2b9d55818
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
2016-08-26 16:22:08 +00:00
Neil Fuller
d8d495f1eb
Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa
...
am: eefc000601
2016-08-26 15:16:56 +00:00
Neil Fuller
eefc000601
Merge "Track java.lang.reflect.Executable API changes"
...
am: 43ec5716aa
2016-08-26 15:09:33 +00:00
Treehugger Robot
43ec5716aa
Merge "Track java.lang.reflect.Executable API changes"
2016-08-26 15:03:22 +00:00
Robin Lee
0737c2b4c2
DO NOT MERGE Stop work challenge freeform bypass
...
Bypassing work challenge in freeform mode was trivial by just keeping
work apps open in freeform mode and then switching focus to them from
another app.
Because the only interception point is startActivity this never
triggered work challenge.
The solution is to trigger the check on focus change events and also to
allow passing the result back into the freeform stack instead of dumping
our user out into the homescreen.
Change-Id: I141ecf90b5f0e708a21d27141b6fec6074e5d475
Fix: 30693465
2016-08-26 14:39:34 +00:00
Neil Fuller
2af6c750ba
Track java.lang.reflect.Executable API changes
...
Bug: 28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
2016-08-26 10:44:51 +01:00
Mark Lu
c9fbef739f
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
...
am: 314d995ca1
2016-08-26 01:03:23 +00:00
Mark Lu
fc68813e5c
docs: Fix typo and broken link in AsyncTask.java
...
am: 53415ff24e
2016-08-26 01:03:17 +00:00
Mark Lu
09e4d9bada
Merge "docs: fix link in Loader reference page" into nyc-dev
...
am: 3c638c1ea1
2016-08-26 01:02:45 +00:00
Mark Lu
c6612637bb
docs: fix link in Loader reference page
...
am: 9f52b7a4a8
2016-08-26 01:02:36 +00:00
Sudheer Shanka
fb3c06f8d1
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev
...
am: fea9feb30e
2016-08-26 01:02:24 +00:00
Sudheer Shanka
80ce19c380
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd
...
am: d57565864b
2016-08-26 01:02:18 +00:00
Sudheer Shanka
7c17f2ee60
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
...
am: cca29c7284
2016-08-26 00:48:59 +00:00
Sudheer Shanka
39d2fe3a4b
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours
...
am: 02ba5ef875
2016-08-26 00:48:56 +00:00
Amith Yamasani
fd539fc8e0
Merge "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" into nyc-dev
...
am: 5f5403def8
2016-08-26 00:48:44 +00:00
Amith Yamasani
5e403681cd
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
2016-08-26 00:48:42 +00:00
Sudheer Shanka
80f80e7e70
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
2016-08-26 00:48:30 +00:00
Sudheer Shanka
6a031dec20
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
2016-08-26 00:48:27 +00:00
Amith Yamasani
3cf46af37b
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
2016-08-26 00:48:15 +00:00
Amith Yamasani
258c3eab25
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
2016-08-26 00:48:13 +00:00
Mark Goldstein
7843568a38
Merge "docs: Fix typo" into nyc-dev
...
am: 8d660eebad
2016-08-26 00:47:59 +00:00
Mark Goldstein
94d4c84f38
docs: Fix typo
...
am: 1c22ae296b
2016-08-26 00:47:56 +00:00
Mark Lu
314d995ca1
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
2016-08-26 00:46:05 +00:00
Mark Lu
3c638c1ea1
Merge "docs: fix link in Loader reference page" into nyc-dev
2016-08-26 00:46:02 +00:00
Narayan Kamath
5a56efd888
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76 am: b0429bbad5
...
am: 1238ffcd2c
2016-08-26 00:42:28 +00:00
Dianne Hackborn
c84e8f39d0
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
...
am: 184edd6d93
2016-08-26 00:42:25 +00:00
Dianne Hackborn
ccc9f7a59e
Try to mitigate issue #31016187 : system_server crash in ArraySet.
...
am: dd28b7b5f3
2016-08-26 00:42:22 +00:00
Mark Lu
7973c74cdc
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
...
am: 30cba33a60
2016-08-26 00:42:17 +00:00
Mark Lu
833d07e53a
docs: rewrite one attribute description in R.attr
...
am: 5dabf06ae5
2016-08-26 00:42:13 +00:00
Mark Lu
6446e88183
Merge "docs: fix broken links in Activity reference" into nyc-dev
...
am: d428a012ba
2016-08-26 00:42:06 +00:00
Mark Lu
c4e81b64f1
docs: fix broken links in Activity reference
...
am: fa43485910
2016-08-26 00:42:01 +00:00
Mark Lu
228b5f6fb4
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
...
am: 209fb02f84
2016-08-26 00:41:54 +00:00
Mark Lu
3de2eff9d5
docs: fix code snippets in SQL Databases page
...
am: 95698f127a
2016-08-26 00:41:48 +00:00
Hemal Patel
309813c8af
resolve merge conflicts of a544221 to nyc-dev-plus-aosp
...
Change-Id: Ie7a3a85fdd2e59eea4f74760010190ce9f5f9b02
2016-08-25 17:30:34 -07:00
Android Build Merger (Role)
fea9feb30e
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev
2016-08-25 23:41:50 +00:00
Android Build Merger (Role)
cca29c7284
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours" into nyc-dev
2016-08-25 23:41:41 +00:00
Android Build Merger (Role)
5f5403def8
Merge "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" into nyc-dev
2016-08-25 23:41:32 +00:00
Android Build Merger (Role)
555fbf30d2
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
2016-08-25 23:41:20 +00:00
Android Build Merger (Role)
4ee46e5b99
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
2016-08-25 23:41:08 +00:00
Mark Goldstein
8d660eebad
Merge "docs: Fix typo" into nyc-dev
2016-08-25 23:40:43 +00:00
Sudheer Shanka
d57565864b
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25
...
am: 7a46fac0cd
2016-08-25 23:39:59 +00:00
Sudheer Shanka
02ba5ef875
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39
...
am: 71933abbdc
2016-08-25 23:39:54 +00:00
Amith Yamasani
4a3caefd6c
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
2016-08-25 23:39:49 +00:00
Sudheer Shanka
6a9490f850
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
2016-08-25 23:39:41 +00:00
Amith Yamasani
b6cc1acb63
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
2016-08-25 23:39:37 +00:00
Sudheer Shanka
7a46fac0cd
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
...
am: 203d1bee25
2016-08-25 23:30:05 +00:00
Sudheer Shanka
71933abbdc
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab
...
am: c35a9fed39
2016-08-25 23:30:03 +00:00
Amith Yamasani
7586e03e06
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
2016-08-25 23:29:59 +00:00
Sudheer Shanka
bc5775c18b
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
2016-08-25 23:29:56 +00:00
Amith Yamasani
a106b52180
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
2016-08-25 23:29:52 +00:00
