summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Libcore: Correct IllegalAccessError class javadocAndreas Gampe2015-05-011-2/+8
| | | | | | | | | IllegalAccessError can be thrown in more than one case. Correct the class documentation to be general, and state example cases of the error. Bug: 19997575 Change-Id: I8b14d8b2fcd77f547d377bec2eecc326743fb671
* Merge "Adjust MacTest for Bouncy Castle workaround." into mnc-devAlex Klyubin2015-04-301-4/+9
|\
| * Adjust MacTest for Bouncy Castle workaround.Alex Klyubin2015-04-291-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidKeyStore-backed Mac implementation is now offered by the "AndroidKeyStoreBCWorkaround" provider (see 4812563f68c87278af68309662433279d10f573e). The test was changed accordingly. Moreover, this test was using a wrong way of detecting the default provider for HMACs that can handle SecretKeySpec instances. This is now fixed as well. Bug: 20691708 Change-Id: I0b3a2d1ff6d968779419305978203ad64d703e99
* | Add a ZoneInfoDB.hasTimeZone API.Narayan Kamath2015-04-302-0/+11
| | | | | | | | | | | | | | | | | | Allows us to query the DB without having to clone an object or an entire strings array. bug: 19106773 bug: 19987403 Change-Id: I66d466e414972b02a75bcfe68263e74de8b9a768
* | Fix JSR-166 tests.Narayan Kamath2015-04-303-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove calls to setSecurityManager, which throws unconditionally on android. - Remove an unsupported AccessController check. - Remove an assertion that the default uncaught exception handler is null. Regular android processes always have one installed. bug: 20628776 (cherry picked from commit 151f344e88956741c0b8e4018df845d85d4eef25) Change-Id: Ida7499c74586d007b8381522bec45f9a0c8fa7b4
* | Update JSR166 tck tests.Narayan Kamath2015-04-3068-1226/+2776
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following tests have been omitted because they are unsupported : - Atomic8Test.java - CompletableFutureTest.java - ConcurrentHashMap8Test.java - DoubleAccumulatorTest.java - DoubleAdderTest.java - ForkJoinPool8Test.java - ForkJoinTask8Test.java - LongAccumulatorTest.java - LongAdderTest.java - SplittableRandomTest.java - StampedLockTest.java - ThreadLocalRandom8Test.java - ThreadPoolExecutor9Test.java A package declaration has been added to all files (package jsr166;) and the base-class JSR166Test has been changed not to rely on features that aren't available on android / junit in the android environment. We also avoid using junit4 style TestSuite declarations. While the CTS test runner handles them properly usually, it trips over itself when it encounters a failure and tries to run each test in an invidual process and fails each test for no good reason (needs investigation on the CTS side of things) bug: 20628776 (cherry picked from commit 5da8b2b3cac51f0f592a5e1941bd84eade9648cd) Change-Id: If35be0881ad8da4c604ce6683149b15c1a85f289
* | Update JSR-166 to Revision 1.43Narayan Kamath2015-04-3054-457/+708
|/ | | | | | | | | | | | | | | | | This is CVS HEAD as of Tue Mar 24 22:30:53 2015 UTC with android specific patches applied. All android patches have a clear "android-note" header. - Most changes are documentation related. - @hide tags have been applied to 1.8 APIs - Atomic*Updater have been updated to use VMStack.* APIs. bug: 20628776 bug: https://code.google.com/p/android/issues/detail?id=170073 (cherry picked from commit aa2ed9e105504f21641d919b410c692981cfe386) Change-Id: Ie7ce1780eda837f3455e6aa365861886956c4063
* am 7b2d3c5e: am 8b7dbade: Merge "Move Class.newInstance to native"Mathieu Chartier2015-04-253-34/+8
|\ | | | | | | | | * commit '7b2d3c5e1d4b77085494c3696d4282858136d81e': Move Class.newInstance to native
| * am 8b7dbade: Merge "Move Class.newInstance to native"Mathieu Chartier2015-04-253-34/+8
| |\ | | | | | | | | | | | | * commit '8b7dbadede97a5166fcddfe6783e89c8957c1830': Move Class.newInstance to native
| | * Merge "Move Class.newInstance to native"Mathieu Chartier2015-04-253-34/+8
| | |\
| | | * Move Class.newInstance to nativeMathieu Chartier2015-04-243-34/+8
| | |/ | | | | | | | | | | | | | | | | | | Also add benchmark for Class.newInstance. Bug: 20269715 Change-Id: Icd52155ce79a978a4d869855bfdfd7735abd8187
* | | am 07bd49f5: am dce989e5: Merge "Update Cipher tests"Kenny Root2015-04-241-0/+50
|\ \ \ | |/ / | | | | | | | | | * commit '07bd49f5d720c49b9788de215f0fb0695cf32d70': Update Cipher tests
| * | am dce989e5: Merge "Update Cipher tests"Kenny Root2015-04-241-0/+50
| |\ \ | | |/ | | | | | | | | | * commit 'dce989e53c440c7bb0eec93abf20a71bf1f49b1c': Update Cipher tests
| | * Merge "Update Cipher tests"Kenny Root2015-04-241-0/+50
| | |\
| | | * Update Cipher testsKenny Root2015-04-241-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InvalidAlgorithmParameterException should be thrown when Ciphers are initialized with null parameters during decrypt or unwrap mode if the Cipher expects it. Bug: 19201819 Change-Id: Id2ce1c3c7929769808fcc9a4048a28ec150e3672
* | | | am e55045a8: am 1681b2cf: Merge "Fix hashCode() for the read barrier lock ↵Hiroshi Yamauchi2015-04-241-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | word change." * commit 'e55045a839e8b4de25d9e15d37d4e748ae508c86': Fix hashCode() for the read barrier lock word change.
| * | | am 1681b2cf: Merge "Fix hashCode() for the read barrier lock word change."Hiroshi Yamauchi2015-04-241-3/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1681b2cf4a78ff88ec8ca9d836137e6a914e7023': Fix hashCode() for the read barrier lock word change.
| | * | Merge "Fix hashCode() for the read barrier lock word change."Hiroshi Yamauchi2015-04-241-3/+4
| | |\ \
| | | * | Fix hashCode() for the read barrier lock word change.Hiroshi Yamauchi2015-04-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mask the low 28 bits of the lock word. Bug: 19355854 Bug: 12687968 Change-Id: Ic6db7e23fa1a98b28564880d78e7c7cc0c8c0bdc
* | | | | am e81b5047: am 69f8fc65: Merge "Use ANDROID_ROOT instead of assuming it is ↵Nicolas Geoffray2015-04-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | /system." * commit 'e81b5047062c6af7f84af2589311c505b25062f4': Use ANDROID_ROOT instead of assuming it is /system.
| * | | | am 69f8fc65: Merge "Use ANDROID_ROOT instead of assuming it is /system."Nicolas Geoffray2015-04-241-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '69f8fc656f04661f9c32176ebfd093e42bae53d4': Use ANDROID_ROOT instead of assuming it is /system.
| | * | | Merge "Use ANDROID_ROOT instead of assuming it is /system."Nicolas Geoffray2015-04-241-1/+1
| | |\ \ \
| | | * | | Use ANDROID_ROOT instead of assuming it is /system.Nicolas Geoffray2015-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow testing without having 'sh', or having an outdated 'sh' in /system. Change-Id: I19f2844822cc282c4e7696d45fb5ccbe1a1710eb
* | | | | | am 8c95e178: am 2b7e589a: Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-246-17/+57
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8c95e17836c652ea89d5bfa94feab4396c332f6e': Tidy up Package and classloader comments
| * | | | | am 2b7e589a: Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-246-17/+57
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2b7e589a8ea095392e97d45f1feb04832bada21c': Tidy up Package and classloader comments
| | * | | | Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-246-17/+57
| | |\ \ \ \
| | | * | | | Tidy up Package and classloader commentsNeil Fuller2015-04-226-17/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 31ae6d22605a0967d722f935bc3a8b868ada4917 Remove a TODO, improve a test and fix a comment. Also fixes a bug in Package demonstrated by the improved test. Bug: 20482259 Change-Id: I6b37413d7004ce85c99bb854e0ec41e5f8588250
* | | | | | | am 975ebbc7: am dcc9e76a: Merge "Remove unnecessary code from ↵Narayan Kamath2015-04-242-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputStreamReader/OutputStreamWriter.init." * commit '975ebbc76ae07da5db4865bf76be6a22221740b4': Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.
| * | | | | | am dcc9e76a: Merge "Remove unnecessary code from ↵Narayan Kamath2015-04-242-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputStreamReader/OutputStreamWriter.init." * commit 'dcc9e76ad6cb529666944c87ddac1a368724d259': Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.
| | * | | | | Merge "Remove unnecessary code from InputStreamReader/OutputStreamWriter.init."Narayan Kamath2015-04-242-2/+7
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.Narayan Kamath2015-04-242-2/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly check that the decoder/encoder isn't null instead. bug: 20452644 Change-Id: Ia43be6b03842af4e5c8945c8854db618b6ec357a
* | | | | | am d3f115a1: am 73e9c6e1: Merge "java/io/RandomAccessFile: do not nullify ↵Sergio Giro2015-04-242-1/+61
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileChannel when closing the RAF" * commit 'd3f115a1c42e73b4759cc049fa7114439b847162': java/io/RandomAccessFile: do not nullify FileChannel when closing the RAF
| * | | | | am 73e9c6e1: Merge "java/io/RandomAccessFile: do not nullify FileChannel ↵Sergio Giro2015-04-242-1/+61
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when closing the RAF" * commit '73e9c6e19e1ffcf00cf55fc1529f9c6c1e8a3bdf': java/io/RandomAccessFile: do not nullify FileChannel when closing the RAF
| | * | | | Merge "java/io/RandomAccessFile: do not nullify FileChannel when closing the ↵Sergio Giro2015-04-242-1/+61
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | RAF"
| | | * | | java/io/RandomAccessFile: do not nullify FileChannel when closing the RAFSergio Giro2015-04-222-1/+61
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getChannel() should return always the same FileChannel, even if it's closed Bug: 19892782 Change-Id: I5bd853b6b0931d9a6320a655c4ef982c9beaa6c0
* | | | | am bd7c7451: am 726db7ae: Merge "Ensure consistency of capitalization in ↵Neil Fuller2015-04-238-331/+430
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit 'bd7c7451634fa46aef554dd6e09421ce2d6033a6': Ensure consistency of capitalization in RelativeDateTimeFormatter
| * | | | am 726db7ae: Merge "Ensure consistency of capitalization in ↵Neil Fuller2015-04-238-331/+430
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit '726db7aea4817a43a1fd094d18e57de5b244ee39': Ensure consistency of capitalization in RelativeDateTimeFormatter
| | * | | Merge "Ensure consistency of capitalization in RelativeDateTimeFormatter"Neil Fuller2015-04-238-331/+430
| | |\ \ \
| | | * | | Ensure consistency of capitalization in RelativeDateTimeFormatterNeil Fuller2015-04-228-331/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains refactoring. Benchmarks below to show no appreciable negative performance impact to formatters. We do now cache a new type of formatter. Benchmarks measured in microseconds on mako. Before: DateIntervalFormat_formatDateRange_DATE 244 DateIntervalFormat_formatDateRange_DATE_TIME 256 DateIntervalFormat_formatDateRange_TIME 208 RelativeDateTimeFormatter_getRelativeDateTimeString 207.2 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 218.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 70.5 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 67.4 After: DateIntervalFormat_formatDateRange_DATE 237 DateIntervalFormat_formatDateRange_DATE_TIME 241 DateIntervalFormat_formatDateRange_TIME 200 RelativeDateTimeFormatter_getRelativeDateTimeString 149.4 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 161.8 RelativeDateTimeFormatter_getRelativeTimeSpanString 71.7 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 69.0 Bug: 20247811 Change-Id: I51075f89ca6b1d8862335e0e5a4d67a5624edfa6
* | | | | | am b2b83acf: am f8975208: Merge "Test that confirms a socket can be closed ↵Neil Fuller2015-04-231-0/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during connect()" * commit 'b2b83acf152d37d3449feac881bde01c0b92e695': Test that confirms a socket can be closed during connect()
| * | | | | am f8975208: Merge "Test that confirms a socket can be closed during connect()"Neil Fuller2015-04-231-0/+33
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f897520855758dfd0053f7b32c52abfaa4a16e2d': Test that confirms a socket can be closed during connect()
| | * | | | Merge "Test that confirms a socket can be closed during connect()"Neil Fuller2015-04-221-0/+33
| | |\ \ \ \
| | | * | | | Test that confirms a socket can be closed during connect()Neil Fuller2015-04-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added to confirm that a thread blocked during an infinite connect() will unblock if the socket is closed. Change-Id: If373d810cd5db7f68a28bab712d8a58ea1fc68be
* | | | | | | am ccb61deb: am 97ca5855: Merge "Move java.nio.Charsets to libcore.util."Narayan Kamath2015-04-225-14/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ccb61deb8f478f91404b75cbe19cb7b9cbcb4f76': Move java.nio.Charsets to libcore.util.
| * | | | | | am 97ca5855: Merge "Move java.nio.Charsets to libcore.util."Narayan Kamath2015-04-225-14/+14
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '97ca5855f9baebb03a6c65363c613d305d62c52e': Move java.nio.Charsets to libcore.util.
| | * | | | | Merge "Move java.nio.Charsets to libcore.util."Narayan Kamath2015-04-225-14/+14
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Move java.nio.Charsets to libcore.util.Narayan Kamath2015-04-225-14/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't public API, and isn't related to NIO. It's only ever used by java.lang.String. bug: 10898787 Change-Id: I4e194406746b88ba7268c2553e467e7e05400b40
* | | | | | am 9cd55497: am 298bf64c: Merge "X509Certificate: Narrow down the scope of ↵Narayan Kamath2015-04-222-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caught exceptions." * commit '9cd55497d16cc2d8888dd204b5b63ace0645fa06': X509Certificate: Narrow down the scope of caught exceptions.
| * | | | | am 298bf64c: Merge "X509Certificate: Narrow down the scope of caught ↵Narayan Kamath2015-04-222-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exceptions." * commit '298bf64cb09d9e11f99aeda8a7a0a1f709ec91f9': X509Certificate: Narrow down the scope of caught exceptions.
| | * | | | Merge "X509Certificate: Narrow down the scope of caught exceptions."Narayan Kamath2015-04-222-3/+3
| | |\ \ \ \
generated by cgit v1.1 at 2025-02-19 17:59:53 +0000