OSDN Git Service
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 [Wed, 24 Aug 2016 23:45:01 +0000 (16:45 -0700)]
resolve merge conflicts of
8aaffd9 to nyc-dev
Change-Id: I4b1603b4cb1cdfc01f4842b2facf8c31a687bbe5
David Christie [Wed, 24 Aug 2016 22:43:09 +0000 (22:43 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48 am:
0777ad8253
am:
187d841b75
Change-Id: I063f0cd3f53be4d58d123d05da7171a47014929d
David Christie [Wed, 24 Aug 2016 22:39:52 +0000 (22:39 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619 am:
3aaac55e70
am:
a6de8f20c7
Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83
David Christie [Wed, 24 Aug 2016 22:33:39 +0000 (22:33 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66 am:
d610363a48
am:
0777ad8253
Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51
David Christie [Wed, 24 Aug 2016 22:33:37 +0000 (22:33 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d am:
dd1016c619
am:
3aaac55e70
Change-Id: I01b09466d9993f28de5c95a7d21555b3be112891
David Christie [Wed, 24 Aug 2016 22:30:20 +0000 (22:30 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5 am:
e24eb2dbb5
am:
362668b6f7
Change-Id: I019f76b45de78171ef888d2175dc9140be172784
David Christie [Wed, 24 Aug 2016 22:23:49 +0000 (22:23 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1 am:
af369f6e66
am:
d610363a48
Change-Id: I186b4bedcf057489deca1e161a052619ce594e56
David Christie [Wed, 24 Aug 2016 22:23:46 +0000 (22:23 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev am:
975879a18d
am:
dd1016c619
Change-Id: I54910f6c22b69b029be80007cdbf06b203886398
David Christie [Wed, 24 Aug 2016 22:23:42 +0000 (22:23 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev am:
6195acc2b5
am:
e24eb2dbb5
Change-Id: Idb6cbe8c16877301aed50faed41fa0390db3cf10
David Christie [Wed, 24 Aug 2016 22:16:07 +0000 (22:16 +0000)]
resolve merge conflicts of
a2399b4 to mnc-dev
am:
6195acc2b5
Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
David Christie [Wed, 24 Aug 2016 22:14:28 +0000 (22:14 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24 am:
41a0dd41f1
am:
af369f6e66
Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4
David Christie [Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
am:
975879a18d
Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167
David Christie [Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)]
resolve merge conflicts of
a2399b4 to mnc-dev
Change-Id: Ifc9e13cdb047ef70799ba8b1b9e91357ef5f2d2a
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +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
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
Salvador Martinez [Wed, 24 Aug 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev
TreeHugger Robot [Wed, 24 Aug 2016 17:27:07 +0000 (17:27 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev
Salvador Martinez [Thu, 4 Aug 2016 20:37:52 +0000 (13:37 -0700)]
Added error handling to settings suggestions list
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.
Bug:
30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit
60d92b3b8390e33e069f343d6a425ab07c498d3d)
David Christie [Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
Julius D'souza [Tue, 23 Aug 2016 16:52:24 +0000 (16:52 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours
am:
d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
Julius D'souza [Tue, 23 Aug 2016 16:45:41 +0000 (16:45 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am:
3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
Yang Ni [Wed, 29 Jun 2016 19:44:06 +0000 (12:44 -0700)]
Updated user document for Single-Source RenderScript
Bug:
29875503
Bug:
29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
Alan Viverette [Wed, 27 Jul 2016 14:23:35 +0000 (10:23 -0400)]
Avoid potential re-entry as a result of child mutation
Don't set the callback until we're all done making changes.
Bug:
30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit
b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
Bug:
18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
Dirk Dougherty [Mon, 22 Aug 2016 06:41:37 +0000 (23:41 -0700)]
Doc change: intl page updates for final n release.
Change-Id: I11445717cf49438ba5a04b50245209161740d4b0
Dirk Dougherty [Thu, 18 Aug 2016 02:09:14 +0000 (19:09 -0700)]
Doc change: updates for final N landing page and related resources.
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
David Friedman [Fri, 19 Aug 2016 21:17:54 +0000 (21:17 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
David Friedman [Fri, 19 Aug 2016 21:16:52 +0000 (21:16 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
Jim Miller [Fri, 19 Aug 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195
am:
364a51221a -s ours
Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
Jim Miller [Fri, 19 Aug 2016 20:23:45 +0000 (20:23 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991
am:
85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
Jim Miller [Fri, 19 Aug 2016 20:16:37 +0000 (20:16 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42
am:
ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
David Friedman [Thu, 18 Aug 2016 01:23:23 +0000 (18:23 -0700)]
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
David Friedman [Fri, 5 Aug 2016 00:55:52 +0000 (17:55 -0700)]
Docs: Adding information to Building-for-Billions landing page.
Bug:
30700934
Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
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
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
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
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
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
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
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
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Narayan Kamath [Thu, 18 Aug 2016 09:58:45 +0000 (09:58 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0
am:
1bd43c162f
Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
Narayan Kamath [Thu, 18 Aug 2016 09:53:12 +0000 (09:53 +0000)]
Process: Fix communication with zygote.
am:
e29c6493c0
Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
smain@google.com [Wed, 17 Aug 2016 23:17:11 +0000 (16:17 -0700)]
add workaround for annotations dependency conflict with espresso
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Hemal Patel [Wed, 17 Aug 2016 19:37:17 +0000 (19:37 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
am:
c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
Hemal Patel [Wed, 17 Aug 2016 19:37:14 +0000 (19:37 +0000)]
Docs: Renamed Google Now to Google Voice Actions
am:
86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
Hemal Patel [Wed, 17 Aug 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am:
085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
Eric Schmidt [Wed, 17 Aug 2016 17:14:11 +0000 (17:14 +0000)]
docs: Fixed code snippet in notify-user/navigation.html
am:
32cc6b7fb7
Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
Andrew Solovay [Tue, 2 Aug 2016 21:24:58 +0000 (14:24 -0700)]
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
Eric Schmidt [Thu, 11 Aug 2016 19:54:31 +0000 (12:54 -0700)]
docs: Fixed code snippet in notify-user/navigation.html
Bug:
25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
Narayan Kamath [Tue, 9 Aug 2016 16:00:25 +0000 (17:00 +0100)]
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
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Jim Miller [Wed, 10 Aug 2016 22:43:17 +0000 (15:43 -0700)]
Fix vulnerability in LockSettings service
Fixes bug
30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
Julius D'souza [Mon, 15 Aug 2016 19:33:29 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours
am:
0903c5fe7a -s ours
Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
David Gross [Mon, 15 Aug 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
David Christie [Fri, 12 Aug 2016 20:17:03 +0000 (20:17 +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
Change-Id: I466311d2aa3983e690778fb1084f93eab7e8ae7d
David Christie [Fri, 12 Aug 2016 20:17:00 +0000 (20:17 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2
am:
b7f8b59e24
Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
David Christie [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +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
Change-Id: I39e11f906f059cf8bb1ea861490a0e9051d11bed
David Christie [Fri, 12 Aug 2016 20:09:54 +0000 (20:09 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev
am:
288166cbb2
Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
David Christie [Fri, 12 Aug 2016 19:56:57 +0000 (19: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
Change-Id: Ie2c2290014481772cf10c5f9e4fc565bf06e74a3
David Gross [Fri, 12 Aug 2016 18:06:29 +0000 (11:06 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
(cherry picked from commit
05eef3040ed1bbd7640151b395072b8264b6d53d)
Phil Weaver [Fri, 5 Aug 2016 18:23:50 +0000 (11:23 -0700)]
Limit capabilities of a11y gesture dispatch.
Changing the service side to accept descriptions of
motion events, not motion events themselves, so we can
control their creation.
Bug:
30647115
Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc
(cherry picked from commit
a8918f23c712e97fa1dc4911f64827d64fc906e5)
David Christie [Thu, 11 Aug 2016 20:06:08 +0000 (13:06 -0700)]
resolve merge conflicts of
b4a5615 to lmp-dev
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
David Christie [Thu, 11 Aug 2016 18:33:18 +0000 (18:33 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev am:
df7bd91dfa
am:
b9fe170c6a
Change-Id: I3e320844622617d9ae63fea4cc3a34f9f0e1e93a
David Christie [Thu, 11 Aug 2016 18:33:15 +0000 (18:33 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923
am:
3462e52676
Change-Id: I45779f683b417fe2d3cd4f7702d07a9cd13bd6f0
David Christie [Thu, 11 Aug 2016 18:27:26 +0000 (18:27 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev
am:
df7bd91dfa
Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7
David Christie [Thu, 11 Aug 2016 18:27:22 +0000 (18:27 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864
am:
dde12c6923
Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
David Christie [Thu, 11 Aug 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864" into klp-dev
smain@google.com [Wed, 10 Aug 2016 19:59:24 +0000 (12:59 -0700)]
add info about how to return default values from android.jar
bug:
30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
Chris Tate [Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af
am:
1d64d33ba8 -s ours
Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
Christopher Tate [Wed, 10 Aug 2016 17:55:47 +0000 (17:55 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c
am:
6ea7b630c2 -s ours
Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
Chris Tate [Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c
am:
a8e21860af
Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
Christopher Tate [Wed, 10 Aug 2016 17:44:50 +0000 (17:44 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107
am:
aac7d0442c
Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
Chris Tate [Wed, 10 Aug 2016 17:28:30 +0000 (17:28 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
am:
72933c623c
Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
Christopher Tate [Wed, 10 Aug 2016 17:28:28 +0000 (17:28 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M
am:
d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev