summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Suppress okhttp's ResponseCacheAdapterTest." into lmp-mr1-devTakayuki Hoshi2014-11-071-0/+1
|\
| * Suppress okhttp's ResponseCacheAdapterTest.Takayuki Hoshi2014-11-071-0/+1
| | | | | | | | | | | | | | This avoids a known SPDY issue that sometimes makes the related CTS tests fail. Bug: 18066923 Change-Id: I9540dc3ad6b6a3d7ab37eb77d46dba39b7bbbb7b
* | Track change to bouncycastleKenny Root2014-11-051-6/+4
| | | | | | | | | | | | | | (cherry picked from commit 218699c1451b91c24d6f65c8b25cf7ac8fffbf7f) Bug: 18013422 Change-Id: Ia5cfe6bf4678048e521c28cfc5f375929379070c
* | Preserve original encoded certificate bytes.Jeff Sharkey2014-11-042-2/+198
|/ | | | | | | | | | | Sadly, the publicly visible android.content.pm.Signature object needs to return the untouched bytes from the parsed APK certificate. Since some CertificateFactory implementations may try re-encoding the certificate, we defensively keep around the original encoded bytes and return them when asked. Bug: 18206852, 18228011 Change-Id: I6016eaea23a7f43cf9249ec43cfde1f8ed4ff841
* Use equals for comparing percent strings.Narayan Kamath2014-11-041-1/+1
| | | | | | | | | bug: 18235329 bug: 15476051 (cherry picked from commit f412a78060760e0aa41bc75a5ab115b6369016de) Change-Id: Ie39e9e014075331aaf5c6b27212fdfdfc42e0380
* Merge "Allow "_" in URIs." into lmp-mr1-devNarayan Kamath2014-11-032-3/+10
|\
| * Allow "_" in URIs.Narayan Kamath2014-10-282-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Note that this is contrary to RFC-2396, which only allows alphanumeric characters and hyphens. We need this change because internet hosts out there clearly don't care enough about standards. bug: 18023709 (cherry picked from commit 435edc3fa9abd3f8d324c9dd4279a165051052ba) Change-Id: I5a2ccad41f302b36b0703ae381f0a9954266ff26
* | am 88122103: am 9ed62cd1: Allow 1 ulp difference in test_cbrt_D and test_sinh_D.Elliott Hughes2014-10-290-0/+0
|\ \ | | | | | | | | | | | | * commit '881221036cc750f94162276c8e5cdb88e6c9240e': Allow 1 ulp difference in test_cbrt_D and test_sinh_D.
| * \ am 9ed62cd1: Allow 1 ulp difference in test_cbrt_D and test_sinh_D.Elliott Hughes2014-10-281-54/+30
| |\ \ | | | | | | | | | | | | | | | | * commit '9ed62cd1e87a433130a089f8cf27de560c643c8a': Allow 1 ulp difference in test_cbrt_D and test_sinh_D.
| | * | Allow 1 ulp difference in test_cbrt_D and test_sinh_D.Elliott Hughes2014-10-281-54/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18016320 (cherry picked from commit cf5f86467f5be5f1c3ae2a5518c65f496ac93e33) Change-Id: I05c3810320d035323e5fec07712b47586eb100bb (cherry picked from commit 8afb381342e073b3bfcc8700b370e381ac23b2e0)
* | | | am be858d3f: am 3f8d941d: Improve DexFile debuggingBrian Carlstrom2014-10-291-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'be858d3f7feb7e59187901431b5dd92009defa41': Improve DexFile debugging
| * | | am 3f8d941d: Improve DexFile debuggingBrian Carlstrom2014-10-281-2/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3f8d941d89f5dd8fff2d6faf705f1841d40c683e': Improve DexFile debugging
| | * | Improve DexFile debuggingBrian Carlstrom2014-10-271-2/+6
| | | | | | | | | | | | | | | | | | | | Bug: 18105751 Change-Id: I16461b61cb7723ca1f3a52080c377d013d76675b
* | | | Disable tzdata in $ANDROID_DATA.Elliott Hughes2014-10-271-2/+1
| |_|/ |/| | | | | | | | | | | Bug: 18139284 Change-Id: I87d52e4f5bf18692a47c762fb4155ba68beffae2
* | | Allow 1 ulp difference in test_cbrt_D and test_sinh_D.Elliott Hughes2014-10-271-54/+30
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18016320 (cherry picked from commit cf5f86467f5be5f1c3ae2a5518c65f496ac93e33) Change-Id: I05c3810320d035323e5fec07712b47586eb100bb
* | | Update tests for HttpURLConnection.disconnect() changesNeil Fuller2014-10-272-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are associated with external/mockwebserver and external/okhttp commits. URLConnectionTest#testDisconnectedConnection - Affected by the bug fix. URLConnectionTest#testSslFallback - Affected by changes to MockWebServer. Handshake failures are no longer queued/recorded. HttpsURLConnectionTest - API changes related to MockWebServer. Bug: 18083851 (cherry pick from commit 246e740c85527012891ac3b07cb658dd2fcabc87) Change-Id: Ia7fe3961b1bc28ef2efa69bbf59a16bc54d07063
* | | Regression test for sl date format consistency.Elliott Hughes2014-10-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17431155 (cherry picked from commit 08ff81f8114bf3e644ebebd319d9d73d9a2738e5) Change-Id: Ia76f78ededb1ba6554c95257cf8cff18bd12d1f3
* | | Fix javadoc links for property related methods.Narayan Kamath2014-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of unchangeable properties is at #getProperty and not #setProperty. bug: 17645282 (cherry picked from commit 8940f9c1623644206ec2281e9f71ef8df9b9a38a) Change-Id: Ief3cf78088e800ffb58e67e1f2d075fbc8ec31f7
* | | am 13ee952b: Only allow once GC request at a time.Mathieu Chartier2014-10-240-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '13ee952b30fdd08b986eb51c07c152f1d0d8f790': Only allow once GC request at a time.
| * | Only allow once GC request at a time.Mathieu Chartier2014-10-241-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to allow multiple, allocating threads may have multiple GC requests before the GC starts. Bug: 17942071 Change-Id: If31afa51a4da95955d538d47397cd96177987bcb (cherry picked from commit 71891f9da2fbcb865931da70ae759032e6698106)
* | | Merge "Only allow once GC request at a time." into lmp-mr1-devMathieu Chartier2014-10-231-7/+2
|\ \ \
| * | | Only allow once GC request at a time.Mathieu Chartier2014-10-221-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to allow multiple, allocating threads may have multiple GC requests before the GC starts. Bug: 17942071 Change-Id: If31afa51a4da95955d538d47397cd96177987bcb
* | | | Wire up frameworks notifications of 12/24 hour preferences.Elliott Hughes2014-10-232-5/+37
|/ / / | | | | | | | | | | | | | | | | | | | | | Bug: 10361358 (cherry picked from commit cafe1a748caf89091d2f1c3956a43daf23b9403b) Change-Id: I2629bbad0737bc5836afa7cfe4a9667095df0357
* | | am 259a7497: am 936306df: autoclose all <a name> tags so they don\'t ↵smain@google.com2014-10-229-19/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | disappear on web site * commit '259a74974e047702383ea00f90634cd4d36b4472': autoclose all <a name> tags so they don't disappear on web site
| * | am 936306df: autoclose all <a name> tags so they don\'t disappear on web sitesmain@google.com2014-10-229-19/+19
| |\ \ | | |/ | | | | | | | | | * commit '936306df62d7d44a806fbeb789c6432e7c325981': autoclose all <a name> tags so they don't disappear on web site
| | * autoclose all <a name> tags so they don't disappear on web sitesmain@google.com2014-10-229-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <a> tags with the name attribute---used to create a page anchor---must be closed immediately and not contain any text because, in order to make the appropriate content visible below the site's "sticky header" when the anchor is followed, CSS is used to hide the <a name> element and position it up higher by an offset equal to the height of the sticky header. So, do not place text inside an <a> tag with the name attribute. Change-Id: Icae1b1f0716aa02d003f921b8e430ad3c99f26d0
* | | am 811476ae: am 76e91645: Update "4.? (STOPSHIP)" to "5.0 (Lollipop)" in ↵Elliott Hughes2014-10-221-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Locale javadoc. * commit '811476ae7f33ed6d45924d9abd76a5eec9e9adc4': Update "4.? (STOPSHIP)" to "5.0 (Lollipop)" in Locale javadoc.
| * | am 76e91645: Update "4.? (STOPSHIP)" to "5.0 (Lollipop)" in Locale javadoc.Elliott Hughes2014-10-211-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '76e916456153c0fed205c9d706fba7f2dedccc8f': Update "4.? (STOPSHIP)" to "5.0 (Lollipop)" in Locale javadoc.
| | * Update "4.? (STOPSHIP)" to "5.0 (Lollipop)" in Locale javadoc.Elliott Hughes2014-10-211-1/+1
| | | | | | | | | | | | | | | Bug: 18074200 Change-Id: I38f8fef6eb5a100f7ef3a1b9bc6640895c85b387
* | | Merge "Improve support for non-BMP characters in XML." into lmp-mr1-devElliott Hughes2014-10-213-28/+110
|\ \ \
| * | | Improve support for non-BMP characters in XML.Elliott Hughes2014-10-183-28/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for writing surrogate pairs out as entity references in KXmlSerializer and for parsing non-BMP entity references in DocumentBuilderImpl. Emoji and XML. Two of my least favorite things together at last. Bug: 17960630 Change-Id: If5e1001faf250e87e6eeebe3449a6ebc115789a1
* | | | Make unchecked getDeclaredFields/Methods methods public-hiddenAlan Viverette2014-10-151-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are used by ViewDebug to obtain the declared fields and methods and then perform type resolution checks on a per-field and per-method basis. Also updates documentation and naming so that the newly exposed methods are less likely to be used incorrectly within the framework. BUG: 17375269 Change-Id: I2f3d4f0ffe3a59e0466e7f7e401c1e5d170d36df
* | | | am 2a8364de: am bc1ea657: Suppress failing OkHttp CTS testsNeil Fuller2014-10-152-0/+51
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '2a8364de2747d7523938f7edb78de904fe3376a4': Suppress failing OkHttp CTS tests
| * | am bc1ea657: Suppress failing OkHttp CTS testsNeil Fuller2014-10-152-0/+51
| |\ \ | | |/ | | | | | | | | | * commit 'bc1ea6573c76663718d441f7b0b849a91f3eefbd': Suppress failing OkHttp CTS tests
| | * Suppress failing OkHttp CTS testsNeil Fuller2014-10-132-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | Added an additional regression test for SSLSocketTest. Bug: 17962997 Bug: 17750026 Change-Id: Ic1171a916a8dbfe4f0ae486d650583de2547175b
* | | am 70b3b1c0: am 39d896a3: am 73041ff9: am bb3214f8: am 2164d895: (-s ours) ↵Neil Fuller2014-10-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp * commit '70b3b1c02e792f67fedcd5ce5c58e85c448c8f67': Add support for TLS_FALLBACK_SCSV
| * | am 39d896a3: am 73041ff9: am bb3214f8: am 2164d895: (-s ours) resolved ↵Neil Fuller2014-10-100-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp * commit '39d896a3dad05a8101b10a675e6e056c717e36c3': Add support for TLS_FALLBACK_SCSV
| | * am 73041ff9: am bb3214f8: am 2164d895: (-s ours) resolved conflicts for ↵Neil Fuller2014-10-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | merge of 865c83f8 to jb-mr2-dev-plus-aosp * commit '73041ff9f871029aa0fa2aae75f3567c6ff96942': Add support for TLS_FALLBACK_SCSV
| | | * am bb3214f8: am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 ↵Neil Fuller2014-10-100-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to jb-mr2-dev-plus-aosp * commit 'bb3214f878cf048dc21b768dac7b0a02ab063033': Add support for TLS_FALLBACK_SCSV
| | | | * am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to ↵Neil Fuller2014-10-100-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev-plus-aosp * commit '2164d895f9ae077ce2d53ccdcc213c3483f3b9bd': Add support for TLS_FALLBACK_SCSV
| | | | | * resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aospNeil Fuller2014-10-108-14/+363
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: I552e60c4cc00bf422aad5ba3939ed50eaef11e56
| | | | | | * Add support for TLS_FALLBACK_SCSVNeil Fuller2014-10-079-14/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of commits: external/conscrypt: 8d7e23e117da591a8d48e6bcda9ed6f58ff1a375 libcore: e6a6e935e98f426c7000b2bf4086f87101f4441c libcore: 957ec8b09833e1c2f2c21380e53c13c9962e6b3e Plus additional changes to: luni/src/main/java/libcore/net/http/HttpConnection.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java luni/src/test/java/libcore/java/net/URLConnectionTest.java luni/src/test/java/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java support/src/test/java/libcore/java/security/StandardNames.java to account for JellyBean differences. Bug: 17750026 Change-Id: I7b60b1260fa0b275631ce9987168c7b5fc7ca138
* | | | | | | Merge "Support DecimalFormatSymbols' percent symbol being a string." into ↵Elliott Hughes2014-10-095-16/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | Support DecimalFormatSymbols' percent symbol being a string.Elliott Hughes2014-10-095-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15476051 (cherry picked from commit a68116c0d8ff9cd517d6b765bf2b8930ed9a3e12) Change-Id: I70ff647dd20b263596685598186ee2f55e1ef8fa
* | | | | | | | am b390fcda: am 15ff3071: am 8b188b86: (-s ours) resolved conflicts for ↵Neil Fuller2014-10-090-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | merge of 6c9609af to klp-modular-dev * commit 'b390fcdad513ae47cd3c801402846b2dd862b103': Add support for TLS_FALLBACK_SCSV
| * | | | | | am 15ff3071: am 8b188b86: (-s ours) resolved conflicts for merge of 6c9609af ↵Neil Fuller2014-10-090-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to klp-modular-dev * commit '15ff3071031c18afbfada8df6c852f7747ccf16a': Add support for TLS_FALLBACK_SCSV
| | * | | | | am 8b188b86: (-s ours) resolved conflicts for merge of 6c9609af to ↵Neil Fuller2014-10-090-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '8b188b864302f5ea9df17636b378938a15b4605a': Add support for TLS_FALLBACK_SCSV
| | | * | | | resolved conflicts for merge of 6c9609af to klp-modular-devNeil Fuller2014-10-094-74/+330
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | Change-Id: I0aacfac04e877702716bf28b1065ebfb9aca2a71
| | | | * | | Add support for TLS_FALLBACK_SCSVNeil Fuller2014-10-088-78/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of commits: external/conscrypt: 8d7e23e117da591a8d48e6bcda9ed6f58ff1a375 libcore: e6a6e935e98f426c7000b2bf4086f87101f4441c libcore: 957ec8b09833e1c2f2c21380e53c13c9962e6b3e Plus additional changes to: luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java luni/src/test/java/libcore/java/net/URLConnectionTest.java luni/src/test/java/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java support/src/test/java/libcore/java/security/StandardNames.java to account for KitKat differences. Bug: 17750026 Change-Id: Ic6e9474275bc3ffec3b5c2d6df1f8d6ffe77bff8
* | | | | | | am 0ebc2354: am 593a2e16: Fix FileTest.Narayan Kamath2014-10-091-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0ebc2354db0614547522ee2ece5299def25b18b0': Fix FileTest.
generated by cgit v1.1 at 2025-01-28 23:46:13 +0000