summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 91be9e67: am 9cfe27bd: am 8068ea8d: Update the ssl test so the client ↵Huahui Wu2010-04-202-16/+51
|\ | | | | | | | | | | | | | | | | reads something 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 . Merge commit '91be9e671d7db5444aa8fa5f0101867ba8a73075' into dalvik-dev * commit '91be9e671d7db5444aa8fa5f0101867ba8a73075': Update the ssl test so the client reads something from the server.
| * 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
* | | | Fixing TimeZone.setDefault() documentation.Jesse Wilson2010-04-204-559/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set expectations for date formatting to tolerate "GMT-07" in the output. The alternative is to emit an ambigous date string. Applications that want pretty date formatting should use the proper facilities: SimpleDateFormat, etc. This problem was detected by org.apache.harmony.luni.tests.java.util.DateTest.test_toString
* | | | resolved conflicts for merge of ee25fc06 to dalvik-devCarl Shapiro2010-04-200-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib8c3c62b3b791a8087d7e6298006a6221726cf78
| * | | am 831eec93: am b8fcf57f: Fix remaining small issues with the lock sampling.Carl Shapiro2010-04-200-0/+0
| |\ \ \ | | |/ /
| | * | am b8fcf57f: Fix remaining small issues with the lock sampling.Carl Shapiro2010-04-200-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'b8fcf57f13b4d37950cfbd72a6af401941d7bdd8' into kraken * commit 'b8fcf57f13b4d37950cfbd72a6af401941d7bdd8': Fix remaining small issues with the lock sampling.
| | | * Fix remaining small issues with the lock sampling.Carl Shapiro2010-04-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Eliminate the now unused lockprofsample flag. The sample percentage has been a function of the wait time an threshold since the previous change. * Eliminate some trailing whitespace that creeped into the previous change. * Eliminate the trailing newline from the event buffer. Because the buffer pointer was not incremented this character was not seen in the event log anyway. * Document the lockProfThreshold global. Change-Id: Ia1c1fcf862d76f5631601e05e7941e5171fab097
* | | | Merge "Fixing reset() on SAXParser and DocumentBuilder, and cleaning up ↵Jesse Wilson2010-04-207-23/+153
|\ \ \ \ | | | | | | | | | | | | | | | nearby tests." into dalvik-dev
| * | | | Fixing reset() on SAXParser and DocumentBuilder, and cleaning up nearby tests.Jesse Wilson2010-04-207-23/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixing vogar to support a directory of test expectations, so we can group them by file rather than colocating failures we want to fix with those that we don't.
* | | | | Merge "Fix a BigInteger(String) bug I introduced yesterday." into dalvik-devElliott Hughes2010-04-202-9/+16
|\ \ \ \ \
| * | | | | Fix a BigInteger(String) bug I introduced yesterday.Elliott Hughes2010-04-202-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I broke parsing of integers in bases greater than 10. Change-Id: I94c4a75c613a1cd8105b7477e68275a81d04d01b
* | | | | | Merge "Make plain "-Xint" work." into dalvik-devAndy McFadden2010-04-200-0/+0
|\ \ \ \ \ \
| * | | | | | Make plain "-Xint" work.Andy McFadden2010-04-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a09a886df9722b60a861969f3e1a1a45988068a
* | | | | | | Merge "Merge commit 'a0a3ad10' into manualmerge" into dalvik-devBrian Carlstrom2010-04-203-19/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge commit 'a0a3ad10' into manualmergeBrian Carlstrom2010-04-193-19/+29
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Change-Id: I23508e348c5de4103e9dda619ca230d0575f57ca
| | * | | | | Merge "openssl-1.0.0 upgrade"Brian Carlstrom2010-04-193-24/+46
| | |\ \ \ \ \
| | | * | | | | 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
* | | | | | | | Since we no longer make use of formatted I/O in the unlock monitorCarl Shapiro2010-04-190-0/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception case, revert to using dvmThrowException which does not treat the description string as an output format. Change-Id: Ice1dc04cb6d1e887af718022cc0b03c6d90f9a19
* | | | | | | am 5005a521: am 612fa566: am af69cf8d: Fix several issues with the lock ↵Carl Shapiro2010-04-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sampling code. This change obsoletes the lockProfSample flag. Merge commit '5005a5210b941d18b7742469ba622b1c8a754b1e' into dalvik-dev * commit '5005a5210b941d18b7742469ba622b1c8a754b1e': Fix several issues with the lock sampling code. This change obsoletes
| * | | | | | am 612fa566: am af69cf8d: Fix several issues with the lock sampling code. ↵Carl Shapiro2010-04-160-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | This change obsoletes the lockProfSample flag.
| | * | | | | am af69cf8d: Fix several issues with the lock sampling code. This change ↵Carl Shapiro2010-04-160-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsoletes the lockProfSample flag. Merge commit 'af69cf8d062a42300852ddee6bcb9f189f5a1b83' into kraken * commit 'af69cf8d062a42300852ddee6bcb9f189f5a1b83': Fix several issues with the lock sampling code. This change obsoletes
| | | * | | | Fix several issues with the lock sampling code. This change obsoletesCarl Shapiro2010-04-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the lockProfSample flag. Change-Id: Idb1846fc3db4ff73678a0dae46aabbb5dbb8b957
* | | | | | | am bd4eaf95: am 54c9323e: am 6b4ba58e: Add a mechanism to long a sample of ↵Carl Shapiro2010-04-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long running lock acquisitions. Merge commit 'bd4eaf959e21f3e048366141896ce262f22e0e2c' into dalvik-dev * commit 'bd4eaf959e21f3e048366141896ce262f22e0e2c': Add a mechanism to long a sample of long running lock acquisitions.
| * | | | | | am 54c9323e: am 6b4ba58e: Add a mechanism to long a sample of long running ↵Carl Shapiro2010-04-150-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | lock acquisitions.
| | * | | | am 6b4ba58e: Add a mechanism to long a sample of long running lock acquisitions.Carl Shapiro2010-04-150-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6b4ba58ec937bfacba626112c46ebd003efbed21' into kraken * commit '6b4ba58ec937bfacba626112c46ebd003efbed21': Add a mechanism to long a sample of long running lock acquisitions.
| | | * | | Add a mechanism to long a sample of long running lock acquisitions.Carl Shapiro2010-04-140-0/+0
| | | | | |
* | | | | | am a731357c: (-s ours) am a8984fe8: (-s ours) am ddc0d4c2: (-s ours) DO NOT ↵Jesse Wilson2010-04-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | MERGE. Suppressing tests that fail in CTS\' test runner. Merge commit 'a731357c0cadaca3863f6fd0de1b8ffb39464220' into dalvik-dev * commit 'a731357c0cadaca3863f6fd0de1b8ffb39464220': DO NOT MERGE. Suppressing tests that fail in CTS' test runner.
| * | | | am a8984fe8: (-s ours) am ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing ↵Jesse Wilson2010-04-150-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | tests that fail in CTS\' test runner.
| | * | | am ddc0d4c2: (-s ours) DO NOT MERGE. Suppressing tests that fail in CTS\' ↵Jesse Wilson2010-04-140-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test runner. Merge commit 'ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8' into kraken * commit 'ddc0d4c2f8d3fea4ddaf6e611ffd73a1169447e8': DO NOT MERGE. Suppressing tests that fail in CTS' test runner.
| | | * | 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
* | | | Fix U_FILE_ACCESS_ERROR RuntimeException in String.getBytes("GB18030").Elliott Hughes2010-04-191-5/+6
| |_|/ |/| | | | | | | | | | | Bug: 2606807 Change-Id: Ie639ce6380e42e0eed2a7e360504f86a22f1fed8
* | | Fix several BigInteger failures.Elliott Hughes2010-04-193-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Java 7 on, BigInteger also accepts a leading "+" in its string constructors. BigInteger has always claimed to accept non-ASCII digits, but our implementation never has. BigInteger.isProbablePrime is defined to return true for certainty <= 0, but OpenSSL (on which we're based) takes the opposite stance. Change-Id: I00bfc591a4d583460f71b7eec3de91bf6b03cd87
* | | Merge "Speed up %d for locales with non-ASCII digits." into dalvik-devElliott Hughes2010-04-191-828/+717
|\ \ \
| * | | Speed up %d for locales with non-ASCII digits.Elliott Hughes2010-04-191-828/+717
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The small "localizeDigits" part of this change is the big speedup. It takes %d in the "ar" Locale from 5x more expensive than "en_US", to just a small percentage more expensive. The big part of this change: removing the useless Transformer and FloatUtils classes touches many lines (mostly just changing the level of indentation), and only has a small percentage effect on performance. The motivation for this is actually primarily that it makes the code easier to read, and makes it easier to share code. Change-Id: I07e86a3ee448510d9ae36579a9af283349f777f1
* | | | Tidying up the error reporting.Jesse Wilson2010-04-182-14/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | We were spamming our logs with a bunch of redundant messages, particularly surrounding timeouts. This should reduce the log output to only the useful stuff when a test takes too long to complete. Also not blowing away the full XML report when a few tests get lost along the way.
* | | Remove a dangling import, and another unused Messages.java.Elliott Hughes2010-04-184-194/+6
| | | | | | | | | | | | | | | | | | Also tidy up our two awt.font classes. Change-Id: I931d348eef7265190f76c31f74c9a5d9ec5d6597
* | | Merge "Remove the nio Messages.java I missed, and the three now-unused ↵Elliott Hughes2010-04-184-146/+0
|\ \ \ | | | | | | | | | | | | imports." into dalvik-dev
| * | | Remove the nio Messages.java I missed, and the three now-unused imports.Elliott Hughes2010-04-184-146/+0
| | | | | | | | | | | | | | | | | | | | | | | | I seem to be having trouble deleting files lately... Change-Id: I019acd19aa61acdeeee1ab6f7fb8a063a41a5534
* | | | Small vogar changes in response to the review for change 49052.Jesse Wilson2010-04-188-16/+24
|/ / /
* | | Merge "Teaching vogar to run prebuilt .jar files." into dalvik-devBrian Carlstrom2010-04-1722-388/+335
|\ \ \
| * | | Teaching vogar to run prebuilt .jar files.Jesse Wilson2010-04-1622-388/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also trying to simplify some internals. We always build to intermediate .jar files now. I've renamed TestFinder to RunnerSpec and fixed its users.
* | | | Merge "Remove "messages" from the logging, math, and nio_char modules." into ↵Elliott Hughes2010-04-1733-1048/+169
|\ \ \ \ | | | | | | | | | | | | | | | dalvik-dev
| * | | | Remove "messages" from the logging, math, and nio_char modules.Elliott Hughes2010-04-1633-1048/+169
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib61b132ce17fdd37956889e855bda35956f8ae62
* | | | | Remove two dead files.Elliott Hughes2010-04-161-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java_lang_Character.cpp has long been dead; I killed AndroidSystemNatives.h this afternoon. I'm not sure how their "git rm"s didn't get included in my earlier patch. Change-Id: Iaa73935846a474dbd25792ed0176ccea092e9f7c
* | | | | Merge "Move the libcore registration out of libnativehelpers and into ↵Elliott Hughes2010-04-1641-250/+206
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | libcore." into dalvik-dev
| * | | | | Move the libcore registration out of libnativehelpers and into libcore.Elliott Hughes2010-04-1641-250/+206
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 754114 Change-Id: Iaa03def509c10cbaa12fd2128584b93d4be4a6b7
* | | | | Merge "Refinements to array and class object size computation." into dalvik-devCarl Shapiro2010-04-160-0/+0
|\ \ \ \ \
| * | | | | Refinements to array and class object size computation.Carl Shapiro2010-04-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rename dvmArrayObjectLength to dvmArrayObjectSize. In the context of arrays length may refer to the length of the array data and not the size of the array object instance. * Add a new method dvmClassObjectSize which computes the total size of a class object including its static fields. Change-Id: I693ec8e66dfa5df35c9f35474c80411ea917c899
generated by cgit v1.1 at 2025-03-26 23:07:05 +0000