summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add test for application use of PathClassLoader." into mnc-devRichard Uhler2015-05-281-0/+23
|\
| * Add test for application use of PathClassLoader.Richard Uhler2015-05-281-0/+23
| | | | | | | | | | | | | | Bug: 19937016 (cherry picked from commit 58bef8e53e41a4b7cfe9cf647dca7c6d46528f32) Change-Id: I347b4eee1f1e3702d34ea10feca6bc1b3f2f1ee8
* | Don't throw UnsupportedOpEx on multi-char negative/percent symbols.Narayan Kamath2015-05-282-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be a fair number of apps that call through to this function, so just give them a "bogus" value (from Locale.ROOT) when we encounter a multi-char symbol. The formatters and other java.text APIs already use the correct multi-char value. bug: 18785260 (cherry picked from commit c3cedb412d85ffeb8121b69308b2d2c35c63b287) Change-Id: I71225102d4f501aaa689fa6e5f84ee967e32f0c8
* | Change >= to > in OldSystemTest.test_gcMathieu Chartier2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | Test no longer will pass if no GC happens. (cherry picked from commit ea43704065f3472072355a2e199ef99ebaecd681) Bug: 21211315 Change-Id: I9fd0a4b5e249ab7b47d6f8e339a4f6a059af7426
* | Fix OldSystemTest gcMathieu Chartier2015-05-271-3/+5
| | | | | | | | | | | | | | | | | | | | Calls System.gc + System.runFinalization since System.gc is usually a NOP. Bug: 21211315 (cherry picked from commit f49f9d8762770b0c9e2493b4656c70ecb6803df4) Change-Id: Ib816521c6ed43eca437bf8fa961650f7fb96ba61
* | Merge "Fix problems with DexClassLoaderTest." into mnc-devRichard Uhler2015-05-271-289/+154
|\ \
| * | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-261-289/+154
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I66d011109259c0c3688b64b083d4ef1ed70feae2
* | Serialize minusSign/percentSign as strings in DecimalFormatSymbols.Narayan Kamath2015-05-272-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to Parcel DFS objects (not sure why anybody would do that, but..) without crashes. bug: https://code.google.com/p/android/issues/detail?id=170718 bug: 21455225 (cherry picked from commit 4fd2c14ce54447f13cd115e105d7b000adf24c2e) Change-Id: I8f860b3fc764932291000ac6651bc95a8e457a99
* | am 97ae95e4: resolved conflicts for merge of 72b26859 to lmp-mr1-ub-devNeil Fuller2015-05-261-0/+8
|\ \ | |/ |/| | | | | * commit '97ae95e4223f64348bc5482ceea0928e1ec55404': Suppress a couple of tests that need quite a lot of memory
| * resolved conflicts for merge of 72b26859 to lmp-mr1-ub-devNeil Fuller2015-05-261-0/+8
| |\ | | | | | | | | | Change-Id: Id188dacbfd8e83fd884f838e392444890a231e5e
| | * Merge "Suppress a couple of tests that need quite a lot of memory" into ↵Neil Fuller2015-05-261-0/+8
| | |\ | | | | | | | | | | | | lollipop-mr1-cts-dev
| | | * Suppress a couple of tests that need quite a lot of memoryNeil Fuller2015-05-231-0/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests fail on some Android Watch devices. Suppressing them until we have a mechanism to detect low memory devices that would allow them to be suppressed more selectively. Bug: 20055487 (cherry-picked from commit fcee6ab5383ee0ad68fcc74ced7581a24d2521de) Change-Id: I53792de9081774b36d03f2de718e73a1c6ff32d5
* | | Revert "Expose getSpi from crypto operations as hidden API."Alex Klyubin2015-05-194-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 050e672aaaaa8f8c57788e8d551f43c5fbffe339. The users of public getSpi have been migrated to getCurrentSpi introduced in 5d15925a79b8beddfafa8de2ede7fff360a386cb. (cherry-picked from commit c52bf74f7e53b9f58bbeb29f4d248e7dba7d15ce) Bug: 18088752 Change-Id: Ied72c8a62a49d9fba8b7bc2d3ef2e30da7daa6e4
* | | Merge "No need to test "GCM" mode in regular Cipher test" into mnc-devKenny Root2015-05-191-1/+1
|\ \ \
| * | | No need to test "GCM" mode in regular Cipher testKenny Root2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert change from 6e0cdd08e2a671393b8a410690d28140a80d9387. Since the regular cipher test expects to be able to use all padding types with every mode, testing GCM is not appropriate here. It is still tested elsewhere in CipherTest. (cherry picked from commit a174063b24e6f792fc58373439808842e1c0d657) Bug: 21209499 Change-Id: Ie20ddab4112f350cce08114c913a89a659823823
* | | | Merge "Track change from GCM -> AES/GCM/NoPadding" into mnc-devKenny Root2015-05-191-2/+2
|\ \ \ \ | |/ / /
| * | | Track change from GCM -> AES/GCM/NoPaddingKenny Root2015-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update tests to track the change from GCM to AES/GCM/NoPadding (cherry picked from commit 6e0cdd08e2a671393b8a410690d28140a80d9387) Bug: 21209499 Change-Id: Ie8383cd2cd0bcb62a38c4c55cd86aa90ad834b2b
* | | | Merge "Follow-up for incorrect test pre-condition" into mnc-devKenny Root2015-05-191-1/+1
|\ \ \ \ | |/ / /
| * | | Follow-up for incorrect test pre-conditionKenny Root2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provider should *not* be present before we install this provider, so update the test to actually assert the correct state. (cherry picked from commit b9129dc7847dd1a89fb5f8d3108369b4da3b0e21) Bug: 21159204 Change-Id: I30f4d4f47fcb6bf278b81c5fd5900d47233cefdb
* | | | Merge "Fix test18566 to have the correct expectation" into mnc-devKenny Root2015-05-191-4/+9
|\ \ \ \ | |/ / /
| * | | Fix test18566 to have the correct expectationKenny Root2015-05-191-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the test was allowing invalid encoding in PKCS#1 data, but this is an exploitable condition in certain cases. See for instance https://www.imperialviolet.org/2014/09/26/pkcs1.html Since BoringSSL has the change to disallow this problem, we are switching this to assert that the signature did not verify. (cherry picked from commit 559126c953cf0e1e4986e24c019bbf996d5ab795) Bug: 21209498 Bug: 5038554 Bug: http://code.google.com/p/android/issues/detail?id=18566 Change-Id: Ie040f644a4588c6801e5557e2f9a3bcdedfd30ac
* | | | Merge "Get rid of old Harmony Services cache" into mnc-devKenny Root2015-05-195-65/+92
|\ \ \ \ | |/ / /
| * | | Get rid of old Harmony Services cacheKenny Root2015-05-195-65/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each java.security.Provider.Service has its own cache, so there is not a lot of benefit to having another cache of the caches. In fact, this makes adding a new provider a huge hit. This change makes adding a new empty provider go from ~5080 microseconds to 73 microseconds. (cherry picked from commit cc4791ad77128039c93d4c03b582d4dc397e6a02) Bug: 21159204 Change-Id: Ib23032f8cb0def79367a321b48241b6cc94de6b0
* | | | Expose getCurrentSpi from crypto operations as hidden API.Alex Klyubin2015-05-184-0/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050e672aaaaa8f8c57788e8d551f43c5fbffe339 exposed the existing getSpi method of Cipher, Signature, Mac, and KeyAgreement as hidden API. Unfortunately, the getSpi method creates an SPI instance if one is not yet set. This changes the state of the crypto operation and does does not lend itself well to being used for read-only querying of the SPI from a crypto operation. This CL addresses the issue by adding a getCurrentSpi hidden API to these crypto operations. getCurrentSpi simply returns the current SPI instance, if any, and does not modify the state of the crypto operation. A follow-up CL will revert 050e672aaaaa8f8c57788e8d551f43c5fbffe339 which will no longer be needed. This is not reverted here to avoid breaking the build. (cherry-picked from commit 5d15925a79b8beddfafa8de2ede7fff360a386cb) Bug: 18088752 Change-Id: I8de4c121c9a395b3687b173d0bba4e1931ebf958
* | | Add an additional check for ICU4J tz data versionNeil Fuller2015-05-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confirm that ZoneInfoDB, ICU4C and now ICU4J all agree on the tz data version. (cherry-pick from commit 32e7bc11723014cc63706541286d0fdf9fbba510) Bug: 19941636 Change-Id: I841de7256f9409abe4b8bcdd66595c346de7c534
* | | Remove signature generation from UpdateTestAppNeil Fuller2015-05-152-102/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The need for a signature was removed in internal changes for the M release. Instead, a permission is required. Related commits: 12964bf5dd36d13fc25efef7c7175a677f9490a5 ef3d6079a55f559191c90d15e3f30a72b576c499 Bug: 19941636 (cherry picked from commit ba148e2de81badc77ad21daca18996d0766e412e) Change-Id: Ie107b344b4e60cd4d71fe78a87d2260405d94c3a
* | | Fix a couple of issues in DexClassLoaderTest.Narayan Kamath2015-05-141-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't create an empty file if test resources are unavailable, fail instead. - Only enumerate ".dex" files in the optimized directory - leave out things like ".flock" files etc. Partial fix for... bug: 21033982 Change-Id: Icf00d4d35f23a1927ea034fdf0ab8ea01f16fe0c
* | | Add tests for AES/GCM/NOPADDINGKenny Root2015-05-131-42/+230
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d5ed0e9c84915f2a93e25a4d152f837a661c4774) Bug: 21085702 Change-Id: I1a88f6410bb61a885bbb447a6e7b86b011dc8625
* | | libcore: add test for arbitrary ECC groups.Adam Langley2015-05-131-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test verifies an ECDSA signature on the BitCoin curve. (cherry picked from commit daadb9f7d41188c0cf2eaaf58d43b7fd46c08da9) Bug: 21085331 Change-Id: I404979ce9b80959a1f88dc340b77507eb53b8cfe
* | | Update ICU / CLDR / Unicode versions for the preview.Narayan Kamath2015-05-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have a release number or a codename yet, but this information is still useful. bug: 19890045 Change-Id: I272e9b9cdfa103f469cb84f1bb4648b39a4510d0
* | | Fix for TimSort in the two Java forms in libcoreNeil Fuller2015-05-133-10/+127
| | | | | | | | | | | | | | | | | | | | | Bug: 19493779 (cherry-picked from commit f547d3aa155a20cfc7cb9852f595ce0806bd1198) Change-Id: I71c7c143386aa4d805b6f1418b72573ddec05dec
* | | Fix a couple of Locale bugs discovered by ICU4J tests.Narayan Kamath2015-05-122-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ULocaleTest revealed two issues : - We weren't handling the legacy ja_JP_JP and th_TH_TH locales correctly. - We weren't lower-casing the extension key in forLanguageTag. This shouldn't matter since language tags are case insensitive, by definition but the convention is to keep them lowercase. This also fixes a bug in the builder where extension keys were case sensitive since we weren't normalizing them properly. bug: 20252611 (cherry picked from commit e45a8ec4f4c53bd068e2eec6d3d07e7567e8381a) Change-Id: Ide19c959c53e44f07e6b781a130c220b52e18352
* | | Fix file descriptor leak when opening invalid archives.Narayan Kamath2015-05-121-0/+1
| | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=171099 Change-Id: I8425d8289839579f1122c61a61ea403f3a7c49fb
* | | Fix bug in formatting intervals at month boundaries.Travis Keep2015-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In formatting date intervals, we subtract one day from the end time if it falls on midnight the next day so that both times are in the same day, thereby avoiding the date appearing in the formatted interval. We did this by calling endCalendar.roll(Calendar.DAY_OF_MONTH, false). However, if endCalendar was 1 May 2015 (say), the date rolls over to 31 May 2015 (this is the documented behaviour of roll). We now use endCalendar.add(Calendar.DAY_OF_MONTH, -1) which always subtracts a day so that 1 May 2015 becomes 30 April 2015, this is the desired behavior. bug: 20708022 (cherry picked from commit 13faecd3105c23f8a60ce3a5847056489fd2d037) Change-Id: Ic947c7c65008d23d1cb1b9bde6af35972ac6acd7
* | | Add a test for bug 20708022.Narayan Kamath2015-05-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that we correctly format date ranges that end at 00:00 on the first day of a month. bug: 20708022. (cherry picked from commit 61dd198b79cd5c63fd8f18f7096b0f44b1491cd5) Change-Id: Ia6387ac560024115314fd3fee2669c6cc11020a7
* | | Document that null collections aren't valid input.Narayan Kamath2015-05-111-1/+6
| | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=172274 Change-Id: Ib397bef6744249fd3241c03dc7cd5eb30f87fa75
* | | Remove StaleDexCacheError.Narayan Kamath2015-05-072-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | Nobody throws it. This is in preparation for simplifying dex2oat error handling and ignoring all compiler / verifier errors. bug: 20888973 Change-Id: I81634ddc07d885b0da0c6c952028ba2032e702c7
* | | Merge "Libcore: Correct IllegalAccessError class javadoc" into mnc-devAndreas Gampe2015-05-051-2/+8
|\ \ \
| * | | 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
* | | | Don't accept [path|file|line].separator from the commandline.Narayan Kamath2015-05-011-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hardcode these values elsewhere in the system, so we shouldn't open ourselves up to inconsistent behaviour when these things are overriden from the command line. It's already impossible to override them using System.setProperty and friends. bug: 20133619 (cherry picked from commit bb3beca471e368c8f5fbf2331e71fc85194f3549) Change-Id: If893ab7e2e8e143b3373a060fef4cc20cf13a544
* | | | Merge libcore project from goog/master into goog/mnc-dev.Jeff Hao2015-04-3014-756/+469
|\ \ \ \ | |/ / / |/| | | | | | | Change-Id: Ic96fbb3faddd1490f1110bd16f2057f181a5c359
| * | | am a9c0a52e: Merge "Add a ZoneInfoDB.hasTimeZone API."Narayan Kamath2015-04-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a9c0a52e64ceed9de66eed2f2eb568cd4e95d3ff': Add a ZoneInfoDB.hasTimeZone API.
| | * \ \ Merge "Add a ZoneInfoDB.hasTimeZone API."Narayan Kamath2015-04-302-0/+11
| | |\ \ \
| | | * | | 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 (cherry picked from commit 3bb833819dba8d530620ad6d43dc53c3fd54763b) Change-Id: Ic100bc3bb0b985ca49a04ccf6a09306c758b78ef
| * | | | am 1bc6f080: Merge "Adjust MacTest for Bouncy Castle workaround." into mnc-devAlex Klyubin2015-04-301-4/+9
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * commit '1bc6f080c77deb3cc53d55ec60c98167ea093911': Adjust MacTest for Bouncy Castle workaround.
* | | | | 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
| | * | | | am 3bb83381: Add a ZoneInfoDB.hasTimeZone API.Narayan Kamath2015-04-302-0/+11
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * commit '3bb833819dba8d530620ad6d43dc53c3fd54763b': Add a ZoneInfoDB.hasTimeZone API.
* | | | | | 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
| | * | | | am 05fd64ae: Fix JSR-166 tests.Narayan Kamath2015-04-300-0/+0
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * commit '05fd64ae4c92b1787a4cfa632ea1e6b3ceeeff91': Fix JSR-166 tests.