Jim Miller
ddf70b9195
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
...
am: 02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991
Bind fingerprint when we start authentication - DO NOT MERGE
...
am: b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
2016-08-19 20:03:48 +00:00
David Friedman
196cb73dbb
Docs: Adds a redirect to make it easier to access Performance section on DAC.
...
d.android.com/performance will now take you to d.android.com/topic/performance
Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
2016-08-19 18:58:28 +00:00
David Friedman
cbaf3f9986
Docs: Adding information to Building-for-Billions landing page.
...
Bug: 30700934
Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
2016-08-19 11:51:24 -07:00
Sudheer Shanka
e49de5e073
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9
...
am: 58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
2016-08-19 18:02:26 +00:00
Amith Yamasani
f705730667
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365
...
am: 5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
2016-08-19 18:02:22 +00:00
Sudheer Shanka
58def3804c
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5
...
am: 08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27
...
am: 39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
2016-08-19 17:54:19 +00:00
Sudheer Shanka
08eb52f9f9
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb
...
am: 7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4
...
am: 29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
2016-08-19 17:32:44 +00:00
Sudheer Shanka
7e890c8eb5
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
...
am: b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27
DO NOT MERGE: Clean up when recycling a pid with a pending launch
...
am: d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
2016-08-19 17:22:25 +00:00
Sudheer Shanka
b51e98becb
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
2016-08-19 17:06:55 +00:00
Sudheer Shanka
badc5cd942
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
2016-08-19 17:06:49 +00:00
Jim Miller
b6f4b48df2
Bind fingerprint when we start authentication - DO NOT MERGE
...
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug 30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +00:00
Scott Main
66ffbbfdf9
Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev
2016-08-19 01:04:03 +00:00
smain@google.com
9ad944f8c9
fix redirect for AIDL doc
...
bug: 5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
2016-08-18 14:41:47 -07:00
Narayan Kamath
c6c7ca0cde
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 am: efab128e67
...
am: 86437ec433
Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
2016-08-18 10:30:00 +00:00
Narayan Kamath
3c63bb367f
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours am: 2984748753
...
am: b9fae65605
Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b
2016-08-18 10:29:55 +00:00
Narayan Kamath
86437ec433
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47
...
am: efab128e67
Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
2016-08-18 10:23:23 +00:00
Narayan Kamath
b9fae65605
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours
...
am: 2984748753
Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
2016-08-18 10:23:20 +00:00
Narayan Kamath
efab128e67
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87
...
am: 4cf5241f47
Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
2016-08-18 10:19:28 +00:00
Narayan Kamath
2984748753
Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108
...
am: b56f4f53e1 -s ours
Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
2016-08-18 10:16:48 +00:00
Narayan Kamath
cce8af824a
Merge "Process: Fix communication with zygote." into nyc-dev
2016-08-18 10:14:31 +00:00
Narayan Kamath
8788a2413c
Process: Fix communication with zygote. am: e29c6493c0
...
am: 1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
2016-08-18 09:58:45 +00:00
Narayan Kamath
4cf5241f47
Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2
...
am: 8fdee85e87
Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
2016-08-18 09:56:29 +00:00
Narayan Kamath
b56f4f53e1
Process: Fix communication with zygote. am: 8e69dd2284
...
am: b85e9e9108
Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
2016-08-18 09:56:24 +00:00
Narayan Kamath
1bd43c162f
Process: Fix communication with zygote.
...
am: e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
2016-08-18 09:53:12 +00:00
Narayan Kamath
8fdee85e87
Merge "Process: Fix communication with zygote." into klp-dev
...
am: 6829cf28e2
Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
2016-08-18 09:50:56 +00:00
Narayan Kamath
b85e9e9108
Process: Fix communication with zygote.
...
am: 8e69dd2284
Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
2016-08-18 09:50:52 +00:00
Narayan Kamath
6829cf28e2
Merge "Process: Fix communication with zygote." into klp-dev
2016-08-18 09:46:18 +00:00
smain@google.com
eee3518d11
add workaround for annotations dependency conflict with espresso
...
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
2016-08-17 16:23:30 -07:00
Jim Miller
e3457fc127
Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e
...
am: cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
2016-08-17 23:22:33 +00:00
Jim Miller
cb83f6188b
Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c
...
am: 229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
2016-08-17 23:15:43 +00:00
Jim Miller
229de7088e
Fix vulnerability in LockSettings service am: 2d71384a13
...
am: 485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c
Fix vulnerability in LockSettings service
...
am: 2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
2016-08-17 22:59:27 +00:00
Dirk Dougherty
96855c49a6
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
2016-08-17 22:53:24 +00:00
Hemal Patel
65813dff14
Docs: Fixed the Bluetooth guide link
...
Fixed the link that points to the Bluetooth guide.
Bug: 29268546
Change-Id: I51c48cebf45c78481f8853a93ff7bcd8483d69ba
2016-08-17 13:55:09 -07:00
Hemal Patel
5e086dc3bb
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
...
am: c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
2016-08-17 19:37:17 +00:00
Hemal Patel
00ff40145d
Docs: Renamed Google Now to Google Voice Actions
...
am: 86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
2016-08-17 19:37:14 +00:00
Hemal Patel
c7902aa4bb
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
2016-08-17 19:32:16 +00:00
Andrew Solovay
39cc61a4db
docs: Docs for Support Library 24.2.0 release
...
am: 085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
2016-08-17 17:48:47 +00:00
Eric Schmidt
c89c8c3e37
docs: Fixed code snippet in notify-user/navigation.html
...
am: 32cc6b7fb7
Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
2016-08-17 17:14:11 +00:00
Dirk Dougherty
b042ab1eb6
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
...
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
2016-08-16 16:28:20 -07:00
Andrew Solovay
085994c40d
docs: Docs for Support Library 24.2.0 release
...
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.
Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.
See first comment for doc stage location.
bug: 30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
2016-08-16 12:29:30 -07:00
Eric Schmidt
32cc6b7fb7
docs: Fixed code snippet in notify-user/navigation.html
...
Bug: 25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
2016-08-16 10:10:49 -07:00
Narayan Kamath
8e69dd2284
Process: Fix communication with zygote.
...
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug: 30143607
(cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df)
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 17:21:49 +01:00
Narayan Kamath
e29c6493c0
Process: Fix communication with zygote.
...
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug: 30143607
(cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df)
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 16:17:29 +00:00
Dirk Dougherty
114c09498d
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
2016-08-16 01:17:32 +00:00