summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
* am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for ↵Neil Fuller2015-08-241-37/+67
|\ | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '3e8abdd9bdca823a635aac3adacf71ef227b18e1': Fixes and improvements for SerializationTest
| * Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
| |\ | | | | | | | | | | | | | | | | | | automerge: 660504a * commit '660504acb29860588107fdf175768e9b036fd3ff': Fixes and improvements for SerializationTest
| | * Fixes and improvements for SerializationTestNeil Fuller2015-08-201-37/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were order-dependent and flawed: test support classes were used in multiple tests but each relied on it being possible to detect static initialization of those classes. There was an incorrect assertion. This change splits out unique test support classes for those that need them, adds more assertions and fixes the broken assertion. Also tidies up some warnings. Bug: 23031484 Change-Id: Ia3bb32dd1dbd02a74931604cae424d7e9312c76d (cherry picked from commit 729d4ecafff8e6af5a71e4fecb2007917cbc2e2a)
* | | am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes ↵Neil Fuller2015-08-061-18/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit 'cd07c28b3c4178600bf38a55e9f4535d9034c6f9': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| * | Revert "Revert "Changes associated with an OkHttp bad proxy response fix""Neil Fuller2015-08-051-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 11c3934f61c6c873fd9caae16947285bc0068965. commit 11c3934f61c6c873fd9caae16947285bc0068965 was incorrectly merged from lollipop-cts-dev into lollipop-mr1-cts-dev. Change-Id: I66fa65f08397fb34d6af1cb73d2c0fa7f57ef1b6
* | | am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes associated ↵Neil Fuller2015-08-051-8/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit 'c1c9f15edfbc1f86b679c90f963e9eb852ad9c53': Revert "Changes associated with an OkHttp bad proxy response fix"
| * | Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" ↵Neil Fuller2015-08-041-8/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into lollipop-cts-dev automerge: 34d183b * commit '34d183b404333627266d568e905a60e2be3a06f3': Revert "Changes associated with an OkHttp bad proxy response fix"
| | * Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" ↵Neil Fuller2015-08-041-8/+18
| | |\ | | | | | | | | | | | | into lollipop-cts-dev
| | | * Revert "Changes associated with an OkHttp bad proxy response fix"Neil Fuller2015-07-171-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 467a6809cd31cbfa94c326415ff3c441d9b1e8be. commit 467a6809cd31cbfa94c326415ff3c441d9b1e8be is present in lollipop-cts-dev but not lollipop-release. This causes the tests to fail when run against a lollipop-release build. DO NOT MERGE ANYWHERE Bug: 22546532 Change-Id: I4582824e94679213f27352e18e7d9bb985954909
| | * | Fixes associated with the tzdata 2015a updateNeil Fuller2015-08-031-8/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chile has changed the rules for DST. The test duplicates testApia below it, so it can be removed. Bug: 19212588 (cherry-picked from commit ebfb8f8b0ee0c0a75d92d8fc56ccd0d87ee7e9ad) Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a (cherry picked from commit a88856485e84ad5cd45a6e16310490d871a679c4)
* | | am 157dae46: am 88051ed3: Merge "Add testInterfaceProperties() . Move ↵Neil Fuller2015-07-131-12/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | Ethernet verification out of testLoopback()." into kitkat-cts-dev automerge: 19679b0 automerge: 2cc1870 * commit '157dae465d0190edb0fb0bed8ad779cadd755faf': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| * | Merge "Add testInterfaceProperties() . Move Ethernet verification out of ↵Neil Fuller2015-07-131-12/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | testLoopback()." into kitkat-cts-dev automerge: 19679b0 automerge: 2cc1870 * commit '2cc187049ed0a5fc6168ffdb8f837b59462e5b53': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | * Merge "Add testInterfaceProperties() . Move Ethernet verification out of ↵Neil Fuller2015-07-131-12/+33
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testLoopback()." into kitkat-cts-dev automerge: 19679b0 * commit '19679b0fde4e1a7321101b558e2f4961daec923e': Add testInterfaceProperties() . Move Ethernet verification out of testLoopback().
| | | * Add testInterfaceProperties() . Move Ethernet verification out of ↵Tochau Hoang2015-07-081-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testLoopback(). Add testInterfaceProperties(): verify if each interface can be retrieved using getByName(). Use type properties of these interfaces to determine if they are Ethernet. Perform address tests on all active Ethernet interfaces. Move Ethernet verification out of testLoopback into testInterfaceProperties. Change-Id: I1641f2995f4ceb858eda38d1ba6137382b2c7ba3 Signed-off-by: Tochau Hoang <tochau.hoang@panasonic.aero>
* | | | am 45c2f8a3: am a17cd656: Merge "Explicitly set DateFormat.is24Hour value ↵Daniel Xie2015-07-021-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | needed by tests" into lollipop-mr1-cts-dev * commit '45c2f8a384ab789ac0410a02debe32d56105ae96': Explicitly set DateFormat.is24Hour value needed by tests
| * | | Explicitly set DateFormat.is24Hour value needed by testsNeil Fuller2015-06-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests fail under CTS if the device is set to use the 24 hour clock. The tests that depend on the value of the setting are now being explicit. Bug: 20899571 Bug: 20937589 Bug: 20939139 Bug: 20378566 Bug: 21585934 Bug: https://code.google.com/p/android/issues/detail?id=162384 (cherry-picked from commit 38a0b85afd4231f46fac59e59ee38729bd5154c4) Change-Id: I1a369baeeac929ef010e7906e92544b9f483f02c
| * | | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into ↵Daniel Xie2015-06-081-0/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev automerge: 2016dc6 * commit '2016dc66a98087c57a15d097fcd04e1ed171e57c': Add exceptions for test_connectLjava_net_SocketAddressI
| | * | Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2015-06-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OldSocketTest's test_connectLjava_net_SocketAddressI would sometimes fail on certain networks. The connection attempt to the 'non-reachable' IP would be reset by a local router before the expected timeout occured, thus causing the test to fail. This change adds additional catch clauses for cases like this, looking for ECONNREFUSED messages. Bug: 18143878 Change-Id: I99a500d5c95cc25aa52ef231e6de43233f3e5316 Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com> (cherry picked from commit d3ba3eb7a3fa67c1de2cb7a5ba999dcf91c13a91)
* | | | am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into ↵Richard Uhler2015-06-021-285/+163
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev automerge: 7feb222 * commit '3ad9b58657e3abff45108d89406e2180adf2d77a': Fix problems with DexClassLoaderTest.
| * | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | automerge: 7feb222 * commit '7feb222f57a3f9ce9d03cb574486e05533f8ef9f': Fix problems with DexClassLoaderTest.
| | * | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-291-285/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem with the DexClassLoaderTest where oat files from previous tests were being cached and reused for later tests. Now each test uses its own directory for loading-test.dex and friends so they are treated as separate dex files from test to test. As part of this fix, the helper functions for the tests were reorganized. Bug: 21033982 (cherry picked from commit 5099b54aaed531ebbbeefacdca4c7ffaf458e3da) Change-Id: I175184277a585840eca50122cf6898f00823ef3e
| * | | Work around issues for MR1 release associated with timezone issue.Neil Fuller2015-02-042-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the tests that were using Pacific/Apia and replace with America/Santiago instead. Pacific/Apia is missing translations in the version of CLDR shipped with MR1. America/Santiago fits the criterion of "has no short names". Bug: 19212588 Change-Id: If241736446fdbbc98464952edad9cbfefc289cb6
* | | | 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
* | | | | 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
* | | | | | Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-245-15/+55
|\ \ \ \ \ \
| * | | | | | Tidy up Package and classloader commentsNeil Fuller2015-04-225-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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
* | | | | | 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
* | | | | | Merge "Ensure consistency of capitalization in RelativeDateTimeFormatter"Neil Fuller2015-04-236-326/+423
|\ \ \ \ \ \
| * | | | | | Ensure consistency of capitalization in RelativeDateTimeFormatterNeil Fuller2015-04-226-326/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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
* | | | | | | | Move java.nio.Charsets to libcore.util.Narayan Kamath2015-04-224-7/+7
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | X509Certificate: Narrow down the scope of caught exceptions.Narayan Kamath2015-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fix the package name of the corresponding test so that vogar isn't confused. bug: 19245702 Change-Id: I647f0c9ca4c81bb41d4b64088b60f37ebc671e84
* | | | | | | java/security/cert: Use Locale.ROOT in X509CRLTestSergio Giro2015-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor polishing requested by kroot@ in another change Change-Id: If8bc2b504236623788ffa2754c86e6525ea5b283
* | | | | | | Merge "java/security/cert: delete test caveat in X509CRLTest"Sergio Giro2015-04-221-9/+1
|\ \ \ \ \ \ \
| * | | | | | | java/security/cert: delete test caveat in X509CRLTestSergio Giro2015-04-211-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caveat to overcome a problem in bouncycastle that was fixed there Bug: 19609712 Change-Id: I227db8e458e67af46ccb1c07bfca77a733f25979
* | | | | | | | Fix Class.forName(..., ..., null) to pass 068-classloader's testClassForNameBrian Carlstrom2015-04-212-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused fallout elsewhere requiring - Package fix to pass 005-annotations - ObjectInputStream fix to pass 093-serialization Change-Id: I6bc470e20fa177e8a3debe55c90a84eef7ef518e
* | | | | | | | Return unlocalized TimeZoneID from TimeZone.getTimeZone()Taiju Tsuiki2015-04-212-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISO 8601 recommends the numbers in the time zone string should be non-localized numbers. Though implemented version returns localized numbers depends on the default locale. This CL removes localization from formiting the time zone ID. Change-Id: If828bcebb13b8509f5caf4dd201a4dbcd7defc38
* | | | | | | | Remove support for reading mime types from property files.Narayan Kamath2015-04-211-61/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support was untested and unused and of very limited utility, given that this class is initialized in the zygote. It also discourages arbitrary changes to the priority order of mappings. Change-Id: I2a7f91d2956627cd59f948561c37678bc45d118d
* | | | | | | Merge "Implement mapLibraryName in Java."Elliott Hughes2015-04-162-14/+6
|\ \ \ \ \ \ \
| * | | | | | | Implement mapLibraryName in Java.Elliott Hughes2015-04-162-14/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need for native code here. Change-Id: Iaeb0369b5638a6681fd94fd999641801719aaea2
* | | | | | | Merge "Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatter"Neil Fuller2015-04-163-113/+114
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatterNeil Fuller2015-04-163-113/+114
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | General strategy: Switch to ICU classes for Calendar, and generally use ICU classes earlier to avoid multiple creations. This also incorporates some feedback from narayan@ from https://android-review.googlesource.com/#/c/145662/ Some small optimizations applied but the goal was not to make it much faster, just to confirm it wasn't much slower. It has sped up some methods, and slowed down others, but not much difference in absolute terms. All times in microseconds measured on a mako. Original: RelativeDateTimeFormatter_getRelativeDateTimeString 582.4 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 603.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 39.9 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 39.1 After: RelativeDateTimeFormatter_getRelativeDateTimeString 207.2 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 218.2 RelativeDateTimeFormatter_getRelativeTimeSpanString 70.5 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 67.4 Original: DateIntervalFormat_formatDateRange_DATE 290 DateIntervalFormat_formatDateRange_DATE_TIME 298 DateIntervalFormat_formatDateRange_TIME 276 After: DateIntervalFormat_formatDateRange_DATE 244 DateIntervalFormat_formatDateRange_DATE_TIME 256 DateIntervalFormat_formatDateRange_TIME 208 Change-Id: If043bd55ffec37ed2735aa1593f327b38749218c
* | | | | | Make Manifest#clone obey clone's contract.Narayan Kamath2015-04-161-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must call through to Object.clone to ensure that we always return an object of the right type. If not, subclasses will have to override clone() instead of calling through to super.clone(). bug: 19748843 Change-Id: Ie2177bbc05c62281f48780e521ad66de3612561e
* | | | | | Fix bad negation in Collections#binarySearch.Narayan Kamath2015-04-162-16/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19749094 Change-Id: Id1d7bcf4abebb423fd3bbb7c8f379bf9e6234969
* | | | | | Unbreak Harmony MacTest.Alex Klyubin2015-04-151-0/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test got broken by recenly added AndroidKeyStore-backed implementation of Mac which cannot be initialized with a SecretKeySpec. Bug: 20222007 Change-Id: Id4941347acd092b435d6797c5ee2477fae8cd516
generated by cgit v1.1 at 2025-02-04 06:53:29 +0000