Narayan Kamath
1238ffcd2c
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
...
am: b0429bbad5
2016-08-25 23:29:29 +00:00
Sudheer Shanka
203d1bee25
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
2016-08-25 23:22:19 +00:00
Sudheer Shanka
c35a9fed39
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
2016-08-25 23:22:14 +00:00
Amith Yamasani
f6361752ca
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
2016-08-25 23:22:10 +00:00
Sudheer Shanka
2f664374fa
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
2016-08-25 23:22:04 +00:00
Amith Yamasani
5eed3c9c38
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
2016-08-25 23:22:00 +00:00
Narayan Kamath
b0429bbad5
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
...
am: a21569cd76
2016-08-25 23:21:09 +00:00
Sudheer Shanka
77dec89bb3
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
...
am: c2a760e68c
2016-08-25 23:14:09 +00:00
Sudheer Shanka
97194798ab
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
2016-08-25 23:14:06 +00:00
Amith Yamasani
75c7391a41
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
2016-08-25 23:14:04 +00:00
Sudheer Shanka
2490679d7e
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
2016-08-25 23:14:01 +00:00
Amith Yamasani
1d513c845a
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099 -s ours
...
am: 368ae62e9d
2016-08-25 23:13:58 +00:00
Narayan Kamath
a21569cd76
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
...
am: 8f4f9e4d5e
2016-08-25 23:13:51 +00:00
Narayan Kamath
8f4f9e4d5e
resolve merge conflicts of 5191225 to mnc-dev
...
am: 1fbc4b8624
2016-08-25 23:08:25 +00:00
Sudheer Shanka
c2a760e68c
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
...
am: cdf70ba0a3
2016-08-25 23:07:56 +00:00
Sudheer Shanka
603a69ffb4
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
2016-08-25 23:07:53 +00:00
Amith Yamasani
9080d4462e
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec
...
am: 7b8140652b
2016-08-25 23:07:51 +00:00
Sudheer Shanka
86ac88ccdb
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
...
am: 26bb7bf86c
2016-08-25 23:07:49 +00:00
Amith Yamasani
368ae62e9d
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
...
am: 117a383099
2016-08-25 23:07:46 +00:00
Andrew Solovay
0fd07c4e79
docs: Removing non-English /preview/ directories
...
am: 2d629c3e5b
2016-08-25 22:43:21 +00:00
Dirk Dougherty
b5760c1fe7
Fetch ga script over https to avoid mixed content.
...
Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43
2016-08-25 14:50:54 -07:00
TreeHugger Robot
184edd6d93
Merge "Try to mitigate issue #31016187 : system_server crash in ArraySet." into nyc-dev
2016-08-25 21:38:45 +00:00
Mark Lu
30cba33a60
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
2016-08-25 21:34:04 +00:00
Mark Lu
d428a012ba
Merge "docs: fix broken links in Activity reference" into nyc-dev
2016-08-25 21:33:31 +00:00
Mark Lu
209fb02f84
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev
2016-08-25 21:33:26 +00:00
Hemal Patel
a544221abd
Docs: Fixed the Bluetooth guide link
...
am: 65813dff14
2016-08-25 21:31:56 +00:00
Felipe Leme
cbd6fb206d
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am: 7f9ed1cd85 -s ours
...
am: 3bfa2451d4
2016-08-25 21:09:50 +00:00
Felipe Leme
3bfa2451d4
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
...
am: 7f9ed1cd85
2016-08-25 21:04:35 +00:00
Treehugger Robot
7f9ed1cd85
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed."
2016-08-25 20:57:25 +00:00
Martijn Coenen
1657493c22
Merge changes from topic 'utf' am: 0a357a1a73
...
am: de8a6a66f6
2016-08-25 20:24:03 +00:00
Martijn Coenen
de8a6a66f6
Merge changes from topic 'utf'
...
am: 0a357a1a73
2016-08-25 20:16:55 +00:00
Martijn Coenen
0a357a1a73
Merge changes from topic 'utf'
...
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
2016-08-25 20:08:14 +00:00
Dianne Hackborn
dd28b7b5f3
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 92aa4b2ba3
2016-08-25 19:49:41 +00:00
Mark Goldstein
1c22ae296b
docs: Fix typo
...
Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7
2016-08-25 12:48:07 -07:00
Andrew Solovay
2d629c3e5b
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
2016-08-25 12:36:36 -07:00
Ivan.liu
9fb8a51cce
Merge "Fix suspend crash issue on no GPU platform." am: 175621f517
...
am: 98b07f6b55
2016-08-25 18:15:44 +00:00
Ivan.liu
98b07f6b55
Merge "Fix suspend crash issue on no GPU platform."
...
am: 175621f517
2016-08-25 18:09:54 +00:00
Treehugger Robot
175621f517
Merge "Fix suspend crash issue on no GPU platform."
2016-08-25 18:01:06 +00:00
Sergio Giro
5a2297190a
java.security.cert: update classes in java.security.cert (part 2)
...
Pulling upstream changes from OpenJDK version jdk8u60 classes
in java.security.cert
- Certificate#hashValue: cache the hash value as to avoid recomputation.
Use the Arrays#hash instead of a simple ad-hoc function.
- Certificate#verify(PublicKey, Provider): new method that just throws
UnsupportedOperationException.
This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags and use of a package-info.java in
place of a package.html file.
- Added comments.
Note not all classes in java.security.cert are updated: X509CRL has more
significant changes and deserves a separate CL.
Change-Id: I44120f1b34c9dc3c062a5d01583bcc87fa2cd558
Test: make droid docs, vogar CertificateTest
Bug: 29631070
Please enter the commit message for your changes. Lines starting
2016-08-25 15:17:58 +01:00
Sergio Giro
0d342700c8
java.security: port DomainLoadStoreParameter from jdk8u60
...
This class is introduced in Java 8
Change-Id: Ibb6dbbeba99cdc97c8da5019d11160c3ce6aa690
Test: check-ojluni-files; make droid docs; vogar DomainLoadStoreParameterTest.java
Bug: 29631070
2016-08-25 14:57:54 +01:00
Sergio Giro
d90d8d615a
Add bound checks to utf16_to_utf8
...
Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78
2016-08-25 12:19:12 +02:00
Sergio Giro
8f7b8a1f6c
Unicode: specify destination length in utf8_to_utf16 methods
...
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
2016-08-25 12:04:40 +02:00
Narayan Kamath
1fbc4b8624
resolve merge conflicts of 5191225 to mnc-dev
...
Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f
2016-08-25 10:43:25 +01:00
Ivan.liu
984827cc9c
Fix suspend crash issue on no GPU platform.
...
eglChooseConfig should return false only if an error occured.
If eglChooseConfig is called with a valid attribute list,
no internal EGL errors occur. And if no available config matches
the requested attribute list, no configs are returned.
Not only the return value of eglChooseConfig should be checked,
the 'num_config' out-param must be inspected too.
If no configs were returned, and no error occurred, then 'num_config' will be 0.
Change-Id: Id36d88820b8e33713bc83e0d4b90c3fee7f005fd
Signed-off-by: Xiaowen Liu <xiaowen.liu@nxp.com >
2016-08-25 10:50:54 +08:00
Paul Jensen
7d2198b586
Avoid crashing when downloading MitM'd PAC that is too big
...
There's two pieces to this fix:
1. Move PAC loading off IoThread which isn't meant for
blocking network fetches. If the fetch takes more than
60s Android reboots when the IoThread is used.
2. Limit PAC fetching to 20MB. Any PAC bigger than that
is likely evil.
MitM of PACs should only be possbile when a non-SSL PAC URL
is used.
Change-Id: Ie1658a1c705615dc85a7fc68053f0dad8d048294
Fixes: 30100884
2016-08-25 02:09:37 +00:00
Narayan Kamath
48609b7e98
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0 am: 472a7792f3
...
am: 77a9ef952c
2016-08-25 01:32:35 +00:00
David Christie
d3bc7c61a0
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
2016-08-25 01:32:27 +00:00
David Christie
3bd70a41a6
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
2016-08-25 01:32:18 +00:00
David Christie
ed259c2283
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 am: 00e1e39ae2
...
am: 4f1d1fc92d
2016-08-25 01:32:10 +00:00
Narayan Kamath
77a9ef952c
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0
...
am: 472a7792f3
2016-08-25 01:25:55 +00:00
