summaryrefslogtreecommitdiffstats
path: root/libcore
Commit message (Collapse)AuthorAgeFilesLines
* Delete libcore, now in its own projectJean-Baptiste Queru2010-04-305763-1330013/+0
| | | | Change-Id: I459e5acceeafc5d60a6cb0ff0958a8080615904a
* no emma instrumentation on core-testGuang Zhu2010-04-281-0/+3
| | | | | | | | * applying emma instrumentation causes OOM in dx * test packages don't need emma instrumentation anyway, it's the package under test that needs to be processed by emma Change-Id: I8e65d3750aae716c52fb98d0b8cd41a748344516
* am d4b6f6aa: am 1dd42bb9: Fix NetworkInterface on sholes/ppp.Elliott Hughes2010-04-211-1/+1
|\
| * am 1dd42bb9: Fix NetworkInterface on sholes/ppp.Elliott Hughes2010-04-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit '1dd42bb9da388c55191449b848f9d82dc4673229' into kraken * commit '1dd42bb9da388c55191449b848f9d82dc4673229': Fix NetworkInterface on sholes/ppp.
| | * Fix NetworkInterface on sholes/ppp.Elliott Hughes2010-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use IFA_LOCAL to get the interface addresses; IFA_ADDRESS is the remote address (which is usually the same as IFA_LOCAL, but not in the ppp case). Tested on sholes, where it fixes the test used in the bug; also tested on passion, where it doesn't break the already-working test. Bug: 2575983 Change-Id: Ib334a002dc099daeeb05cbc341fe233d4d11d2f7
* | | Merge "include emma into core library on conditional flag"Guang Zhu2010-04-201-0/+5
|\ \ \
| * | | include emma into core library on conditional flagGuang Zhu2010-03-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emma library is used for collecting code coverage. Current pain point is that for collecting code coverage, developers either need to include emma as a local static library, or change BOOTCLASSPATH to include emma which includes hacking boot image and reflashing it. With this change, emma will be integrated into core.jar if EMMA_INSTRUMENT flag is on, so pushing the updated framework.jar and perform a runtime restart will make emma globally available to all code coverage tests. This change will only affect code coverage builds. Change-Id: I097254835ef4817d068e8946ecbec60135e1f515
* | | | am 9cfe27bd: am 8068ea8d: Update the ssl test so the client reads something ↵Huahui Wu2010-04-202-16/+51
|\ \ \ \ | | |/ / | |/| | | | | | from the server. This is needed when cut-through feature is needed as in b/2586347. Dr. No approved in http://b/issue?id=2511073 .
| * | | am 8068ea8d: Update the ssl test so the client reads something from the ↵Huahui Wu2010-04-202-16/+51
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | server. This is needed when cut-through feature is needed as in b/2586347. Dr. No approved in http://b/issue?id=2511073 . Merge commit '8068ea8daa37ac1e4d55c2ebd15bf9dda3d7891e' into kraken * commit '8068ea8daa37ac1e4d55c2ebd15bf9dda3d7891e': Update the ssl test so the client reads something from the server.
| | * | Update the ssl test so the client reads something from the server.Huahui Wu2010-04-202-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed when cut-through feature is needed as in b/2586347. Dr. No approved in http://b/issue?id=2511073 . Change-Id: Id84724873522fe0435dbda342616da02783f7d6b
| | * | DO NOT MERGE. Suppressing tests that fail in CTS' test runner.Jesse Wilson2010-04-1410-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests have been verified to work successfully in run-core-tests. We plan on unifying CTS and Dalvik's test running infrastructure in this quarter so that we don't need such unfortunate hacks. Test failures: http://b/issue?id=2564250 Fix test runner: http://b/issue?id=2215226 Change-Id: I3df2f4de10705dc470e397da2d0f014141573da1
* | | openssl-1.0.0 upgradeBrian Carlstrom2010-04-153-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/openssl Updated version to 1.0.0 openssl.version Updated small records patch for 1.0.0. This is probably the most significant change. patches/small_records.patch Removed bad_version.patch since fix is included in 0.9.8n and beyond patches/README patches/bad_version.patch openssl.config Changed import_openssl.sh to generate armv4 asm with the 1.0.0 scripts, not our backported 0.9.9-dev backported version in patches/arm-asm.patch. import_openssl.sh openssl.config patches/README patches/arm-asm.patch Added -DOPENSSL_NO_STORE to match ./Configure output Added -DOPENSSL_NO_WHIRLPOOL (no-whrlpool) to skip new optional cipher android-config.mk openssl.config Fixed import to remove include directory during import like other imported directories (apps, ssl, crypto) import_openssl.sh Updated UNNEEDED_SOURCES. Pruned Makefiles which we don't use. openssl.config Updated to build newly required files patches/apps_Android.mk patches/crypto_Android.mk Disable some new openssl tools patches/progs.patch Automatically imported android.testssl/ apps/ crypto/ e_os.h e_os2.h include/ ssl/ dalvik Change makeCipherList to skip SSLv2 ciphers that 1.0.0 now returns so there are not duplicate ciphersuite names in getEnabledCipherSuites. libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Updated OpenSSLSocketImpl_cipherauthenticationmethod for new SSL_CIPHER algorithms -> algorithm_auth (and const-ness) libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Update to const SSL_CIPHER in OpenSSLSessionImpl_getCipherSuite (and cipherauthenticationmethod) libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp test_EnabledCipherSuites on both SSLSocketTest and SSLServerSocketTest caught the makeCipherList problem. However the asserts where a bit out of sync and didn't give good messages because they didn't actually show what was going on. As part of debugging the issue they found, I tried to make align the asserts and improve their output for the future. libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java vendor/google Add const to X509V3_EXT_METHOD* for 1.0.0 compatibility libraries/libjingle/talk/base/openssladapter.cc Change-Id: I9e848c79772211d3956f8561ec526339b30e24a4
* | | am e09ba122: Fixing PipedInputStreamTest to fill the buffer before dying on ↵Jesse Wilson2010-04-151-5/+7
|\| | | | | | | | | | | a dead reader.
| * | Fixing PipedInputStreamTest to fill the buffer before dying on a dead reader.Jesse Wilson2010-04-131-5/+7
| | | | | | | | | | | | Change-Id: Ie34a8bec7b2a34d2933225d6d4e04e0643dbcf99
* | | am 5fdfbeff: Fix SSL_shutdown error reporting to print a proper error ↵Brian Carlstrom2010-04-101-1/+2
|\| | | | | | | | | | | instead of "Ok"
| * | Fix SSL_shutdown error reporting to print a proper error instead of "Ok"Brian Carlstrom2010-04-091-1/+2
| | | | | | | | | | | | | | | | | | There are other problematic error reporting cases to be fixed later, but this one seems to be the frequently occuring. Change-Id: Ia5910cffb60cc694066be03d43ac1bb7eab47357
* | | Disable System.setSecurityManager.Elliott Hughes2010-04-081-34/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | We plan on removing SecurityManager checks, which are expensive and non-useful, especially because Android doesn't use SecurityManager itself. As a first step, let's ship a release where it's no longer possible to set a SecurityManager. Bug: 1320501 Change-Id: I88664dbc1d8b087579d54003a1aaed7b3d8412be
* | | am 5dde0c4d: Merge "Adding support for hash \'#\' comments to our JSON ↵Jesse Wilson2010-04-063-30/+70
|\| | | | | | | | | | | parser." into froyo
| * | Merge "Adding support for hash '#' comments to our JSON parser." into froyoJesse Wilson2010-04-063-30/+70
| |\ \
| | * | Adding support for hash '#' comments to our JSON parser.Jesse Wilson2010-04-063-30/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither the JSON RFC nor the documentation of Crockford's implementation mention these comments, but somehow the old parser used to support these. And so we shall also. See bug 2571423. Change-Id: I77d64c5ec53278d8df5fe1873404f1241320504b
* | | | am f3c7fd52: Merge "Froyo InputStream.available documentation improvement." ↵Elliott Hughes2010-04-0518-158/+70
|\| | | | | | | | | | | | | | | into froyo
| * | | Merge "Froyo InputStream.available documentation improvement." into froyoElliott Hughes2010-04-0518-158/+70
| |\ \ \
| | * | | Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-0518-158/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
* | | | | am 4ff253ff: Remove JSON License from NOTICE fileBrian Carlstrom2010-04-021-28/+0
|\| | | |
| * | | | Remove JSON License from NOTICE fileBrian Carlstrom2010-04-021-28/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
* | | | | Have certimport.sh list certificates in BKS keystore after importing for ↵Brian Carlstrom2010-03-311-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | verification/debugging Change-Id: Ic336f10d96bbf93b1dc5cfd8b64a4c9eaa4f3a68
* / / / Remove debug message from OpenSSL JNI codeBrian Carlstrom2010-03-301-1/+0
|/ / / | | | | | | | | | Change-Id: I70c68087b7d109634eb3240dca1f27e6f20d3da6
* | | Add an @KnownFailure annotation.Elliott Hughes2010-03-301-2/+2
| | | | | | | | | | | | | | | Bug: 2489458 Change-Id: Ib1121c6190b63baae8dbc6a8a598c3f5a510cfaf
* | | Merge "Fixing tests to handle changes in our behaviour since DOM 3." into froyoJesse Wilson2010-03-2616-81/+80
|\ \ \
| * | | Fixing tests to handle changes in our behaviour since DOM 3.Jesse Wilson2010-03-2616-81/+80
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our exception priority has changed for DOM attributes. We previously used to throw DOMExceptions with namespace error codes and now throw DOMExceptions with character error codes when the attribute name is malformed. This caused changes to many tests. Another notable behaviour change is that we now supply the qname (like the RI) where previously we did not. It is optional, but we now include it for RI-consistency. Yet another behaviour change is that we don't look at System properties when choosing a SAX implementation. This simplifies our internals significantly. End users who want an alternative SAX implementation should construct it manually. Also adding @KnownFailure tags for new tests that we have never yet passed. Change-Id: I6f81bedd7c2a0867086dc507b3220c2b07c4d3d3
* / / Suppressing additional tests that fail in Froyo.Jesse Wilson2010-03-264-0/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Our File class doesn't do SecurityManager checks at the same time as it did previously. We added a failing logging test but not the fix. We moved the SQL drivers around, causing some SQL tests to fail. A new logging test doesn't load its resources using the safe pattern. Change-Id: I34ab81e4001969aa536f61a89c277ae2b879d49d
* | Test and document our handling of nulls with getString().Jesse Wilson2010-03-252-1/+26
| | | | | | | | | | | | | | | | | | | | Our behaviour is consistent with Crockford's. The test confirms that the behaviour is consistent with the report of that bug, which the submitter claims is not how it should behave. http://code.google.com/p/android/issues/detail?id=7257 Change-Id: Ibace4bd995e3cbc8fb6c9dc509f8f4491865a647
* | Fix java.util.Random's constructors.Elliott Hughes2010-03-243-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subclasses rely on having their overridden setSeed called by Random's constructors, and the RI actually documents this behavior. (The documentation even changed between Java 5 and Java 6 to make it _more_ explicit.) This patch keeps that part of I6239d93bb46876ef1c4a5e155a6dc1ac6fab4eae that improved our randomness, but reverts the attempt to fix Random's uncouth behavior. Also a regression test so we don't try to fix Random again in future. Bug: 2502231 Change-Id: Ieea1009145c74eac9475c0cd5066dabad20eb114
* | Don't leak memory on failed pipe or mutex initKenny Root2010-03-241-0/+2
| | | | | | | | | | | | | | SSL allocation might fail on pipe or mutex creation, so free allocated memory when that happens. Change-Id: Ibe3813cb652db1e880e3acf0dc1fa37fbe0ad455
* | Improve java.net.InetAddress.getLocalHost documentation.Elliott Hughes2010-03-231-4/+32
| | | | | | | | | | Bug: 1518707 Change-Id: I741a7a28325320949e84e997e6a49d3356c9a308
* | Merge "Fixing namespace+prefix mode in Expat and removing optional fields ↵Jesse Wilson2010-03-194-3/+179
|\ \ | | | | | | | | | from callbacks."
| * | Fixing namespace+prefix mode in Expat and removing optional fields from ↵Jesse Wilson2010-03-194-3/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks. The first part is related to bug 6632: http://code.google.com/p/android/issues/detail?id=6632 I added these optional fields back when I was originally updating the XML parser for Froyo. I've decided to remove them to simplify migrating between Android and the RI. It should also save some object allocations. Note that the RI v5 and the RI v6 behave differently for optional values on attributes; this motivated me to add the otherwise unfortunate assertOneOf() method to the testcase. (We behave more like RI v6, which is to supply the values upon request) Change-Id: Icfa5d29976a86bf194b3ed7c0d9e2275c3bff9dd
* | | Move String creation outside O(n^2) path in LogManagerBjorn Bringert2010-03-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This more than halves the number of Strings and StringBuilders created when constructing a GoogleHttpClient and executing a single HTTP request. Bug http://b/issue?id=2529141 Change-Id: Ia8268fd692b08cf82e4abbffe1459e461e9f7e68
* | | Drop needless parens from Javadoc.Jesse Wilson2010-03-184-14/+14
|/ / | | | | | | | | | | | | Although this violates my longstanding style preference, it agrees with almighty JJB's official ArrayList, which is Good Enough For Me. Change-Id: I7b608c12e04d0b7789bfcabeab4b7347ad22baca
* | Javadoc for JSONArray.Jesse Wilson2010-03-182-24/+290
| | | | | | | | Change-Id: I3aced2607b48210f76887e0d42b591c098ce5db7
* | Fixing 10 of the XPath failures caused by a malformed Document.Jesse Wilson2010-03-172-4/+25
| | | | | | | | | | | | | | | | | | See bug 2518858. This makes our XPath implementation fail the exact same tests as the RI's. (which we assume is also based on Apache Xalan) Change-Id: I9a98323113c95609651e948ad11113f84ccd87ec
* | Merge "Exercising our XPath implementation with 279 of Jaxen's tests."Jesse Wilson2010-03-172-1/+318
|\ \
| * | Exercising our XPath implementation with 279 of Jaxen's tests.Jesse Wilson2010-03-162-1/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both our implementation and the RIv6 fail 29 tests, 17 of which are "could not find function" failures regarding our common lack of support for the evaluate(), document(), upper-case() and lower-case() functions. In addition, our implementation fails 10 additional tests: xml/moreover.xml / /child::node() "expected:<1> but was:<3>" xml/simple.xml / string() "expected:<abd> but was:<" xml/web.xml / /child::node() "expected:<web-app> but was:<>" xml/web.xml / child::node() "expected:<web-app> but was:<>" xml/web.xml / name(/child::node()) "expected:<web-app> but was:<>" xml/web.xml / name(/child::node()) "expected:<web-app> but was:<>" xml/web.xml / name(/node()) "expected:<web-app> but was:<>" xml/web.xml / name(child::node()) "expected:<web-app> but was:<>" xml/web.xml / name(node()) "expected:<web-app> but was:<>" xml/web.xml /* name(../child::node()) "expected:<web-app> but was:<>" Change-Id: Icb4695bbf826fd8f1c1ffae5e857169ff551f75e
* | | Merge "Javadocs for JSONObject."Jesse Wilson2010-03-173-7/+374
|\ \ \
| * | | Javadocs for JSONObject.Jesse Wilson2010-03-173-7/+374
| |/ / | | | | | | | | | Change-Id: I5ec9df6a3a9baac8f4f498890cd35feff774737a
* | | Merge "Replace a use of index with strchr."Carl Shapiro2010-03-161-1/+1
|\ \ \
| * | | Replace a use of index with strchr.Carl Shapiro2010-03-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2c1238bc1bd0945533712d0d74a761721b8408a3
* | | | Fixing an @link issue that is upsetting DroidDoc.Jesse Wilson2010-03-161-4/+4
| |/ / |/| | | | | | | | Change-Id: I9837cfd46684ac6d5b9ec4ac6809da3c3f61d57d
* | | Merge "First half of JSON Javadocs."Jesse Wilson2010-03-163-19/+214
|\ \ \
| * | | First half of JSON Javadocs.Jesse Wilson2010-03-163-19/+214
| |/ / | | | | | | | | | Change-Id: I277ec3b35a28802dd7b7f82c1f4bbadbd3cc4c65
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-10 19:04:43 +0000