summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libcore: throw InvalidKeyException instead of ProviderExceptionSergio Giro2015-06-099-56/+375
| | | | | | | | | | | | In java.security javax.crypto and java.security classes with late binding, when guessing the provider and none of the available ones supports the specified key Bug: 18987633 (cherry pick from e38b83dd96281d178b01476b67d354655bf2de62) Change-Id: I5931046e9044984baf724157138bf3a7c7ef5e90
* Update CA certificatesKenny Root2015-06-0819-861/+890
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADDED Repository imported SHA1 : BA:29:41:60:77:98:3F:F4:F3:EF:F2:31:05:3B:2E:EA:6D:4D:45:FD Subject : C=US, O=IdenTrust, CN=IdenTrust Public Sector Root CA 1 Not Before: Jan 16 17:53:32 2014 GMT Not After : Jan 16 17:53:32 2034 GMT ADDED Repository imported SHA1 : D8:EB:6B:41:51:92:59:E0:F3:E7:85:00:C0:3D:B6:88:97:C9:EE:FC Subject : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G3 Not Before: Nov 14 11:28:42 2013 GMT Not After : Nov 13 23:00:00 2028 GMT ADDED Repository imported SHA1 : 76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB Subject : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA Not Before: Dec 8 11:19:29 2010 GMT Not After : Dec 8 11:10:28 2022 GMT ADDED Repository imported SHA1 : E2:B8:29:4B:55:84:AB:6B:58:C2:90:46:6C:AC:3F:B8:39:8F:84:83 Subject : C=CN, O=China Financial Certification Authority, CN=CFCA EV ROOT Not Before: Aug 8 03:07:01 2012 GMT Not After : Dec 31 03:07:01 2029 GMT ADDED Repository imported SHA1 : DF:71:7E:AA:4A:D9:4E:C9:55:84:99:60:2D:48:DE:5F:BC:F0:3A:25 Subject : C=US, O=IdenTrust, CN=IdenTrust Commercial Root CA 1 Not Before: Jan 16 18:12:23 2014 GMT Not After : Jan 16 18:12:23 2034 GMT ADDED from http://www.turktrust.com.tr/sertifikalar/TURKTRUST_Elektronik_Sertifika_Hizmet_Saglayicisi_h5.crt (sha1 confirmed) SHA1 : C4:18:F6:4D:46:D1:DF:00:3D:27:30:13:72:43:A9:12:11:C6:75:FB Subject : C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E., CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 H5 Not Before: Apr 30 08:07:01 2013 GMT Not After : Apr 28 08:07:01 2023 GMT ADDED from http://www.turktrust.com.tr/sertifikalar/TURKTRUST_Elektronik_Sertifika_Hizmet_Saglayicisi_h6.crt (sha1 confirmed) SHA1 : 8A:5C:8C:EE:A5:03:E6:05:56:BA:D8:1B:D4:F6:C9:B0:ED:E5:2F:E0 Subject : C=TR, L=Ankara, O=T\xC3\x9CRKTRUST Bilgi \xC4\xB0leti\xC5\x9Fim ve Bili\xC5\x9Fim G\xC3\xBCvenli\xC4\x9Fi Hizmetleri A.\xC5\x9E., CN=T\xC3\x9CRKTRUST Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 H6 Not Before: Dec 18 09:04:10 2013 GMT Not After : Dec 16 09:04:10 2023 GMT ADDED from http://www.certinomis.fr/publi/cer/AC_Racine_G3.cer (sha1 confirmed) SHA1 : 9D:70:BB:01:A5:A4:A0:18:11:2E:F7:1C:01:B9:32:C5:34:E7:88:A8 Subject : C=FR, O=Certinomis, OU=0002 433998903, CN=Certinomis - Root CA Not Before: Oct 21 09:17:18 2013 GMT Not After : Oct 21 09:17:18 2033 GMT REMOVE old root; last issued certificate expired SHA1 : DA:40:18:8B:91:89:A3:ED:EE:AE:DA:97:FE:2F:9D:F5:B7:D1:8A:41 Subject : C=US, O=Equifax Secure Inc., CN=Equifax Secure eBusiness CA-1 Not Before: Jun 21 04:00:00 1999 GMT Not After : Jun 21 04:00:00 2020 GMT REMOVE 1024-bit root removed SHA1 : 7E:78:4A:10:1C:82:65:CC:2D:E1:F1:6D:47:B4:40:CA:D9:0A:19:45 Subject : C=US, O=Equifax Secure Inc., CN=Equifax Secure Global eBusiness CA-1 Not Before: Jun 21 04:00:00 1999 GMT Not After : Jun 21 04:00:00 2020 GMT REMOVE 1024-bit root removed SHA1 : E0:AB:05:94:20:72:54:93:05:60:62:02:36:70:F7:CD:2E:FC:66:66 Subject : C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Premium Server CA/emailAddress=premium-server@thawte.com Not Before: Aug 1 00:00:00 1996 GMT Not After : Jan 1 23:59:59 2021 GMT REMOVE 1024-bit root SHA1 : 85:37:1C:A6:E5:50:14:3D:CE:28:03:47:1B:DE:3A:09:E8:F8:77:0F Subject : C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network Not Before: May 18 00:00:00 1998 GMT Not After : Aug 1 23:59:59 2028 GMT REMOVE old root; last issued certificate expired SHA1 : 39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A Subject : C=US, O=America Online Inc., CN=America Online Root Certification Authority 1 Not Before: May 28 06:00:00 2002 GMT Not After : Nov 19 20:43:00 2037 GMT REMOVE old root; last issued certificate expired SHA1 : 85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84 Subject : C=US, O=America Online Inc., CN=America Online Root Certification Authority 2 Not Before: May 28 06:00:00 2002 GMT Not After : Sep 29 14:08:00 2037 GMT REMOVE old root cert no longer in use SHA1 : 80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5 Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Class 3 CA, CN=TC TrustCenter Class 3 CA II Not Before: Jan 12 14:41:57 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE unused, see https://bugzilla.mozilla.org/show_bug.cgi?id=850740 SHA1 : 6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3 Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Universal CA, CN=TC TrustCenter Universal CA I Not Before: Mar 22 15:54:28 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE unused, see https://bugzilla.mozilla.org/show_bug.cgi?id=850740 SHA1 : AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E Subject : C=DE, O=TC TrustCenter GmbH, OU=TC TrustCenter Class 2 CA, CN=TC TrustCenter Class 2 CA II Not Before: Jan 12 14:38:43 2006 GMT Not After : Dec 31 22:59:59 2025 GMT REMOVE Audit requirements not met SHA1 : DD:E1:D2:A9:01:80:2E:1D:87:5E:84:B3:80:7E:4B:B1:FD:99:41:34 Subject : C=TR, O=Elektronik Bilgi Guvenligi A.S., CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi Not Before: Jan 4 11:32:48 2007 GMT Not After : Jan 4 11:32:48 2017 GMT (cherry picked from commit 226c1f270ea2f96d13b31bdf47b929f960c29b56) Bug: 19418204 Bug: 20033228 Bug: 20069329 Bug: 20643923 Bug: 21480355 Change-Id: I17bf8f3224832b9d67f51e3b1011530f3319058e
* am 3039ab33: am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved ↵Kenny Root2015-06-060-0/+0
|\ | | | | | | | | | | | | conflicts for merge of d8b18995 to klp-modular-dev * commit '3039ab33971b83fc8dfc7fded39810a2bdc917d1': OpenSSLX509Certificate: mark mContext as transient
| * am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for ↵Kenny Root2015-06-040-0/+0
| |\ | | | | | | | | | | | | | | | | | | merge of d8b18995 to klp-modular-dev * commit '81a0cd7760edf6f06977ebfc5ec4633f17352078': OpenSSLX509Certificate: mark mContext as transient
| | * am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of ↵Kenny Root2015-06-040-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | d8b18995 to klp-modular-dev * commit 'a6eb9b5f9ad50f52c5bc7bc39b183e4e14d93677': OpenSSLX509Certificate: mark mContext as transient
| | | * am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to ↵Kenny Root2015-06-020-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '9585bbef61a7998f840c6ed4b0eb6d88fb4e632a': OpenSSLX509Certificate: mark mContext as transient
| | | | * am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-020-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9b110bb1feeb32e092bfc6af5d122f58f1ef3e0': OpenSSLX509Certificate: mark mContext as transient
| | | | | * resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-010-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: Id62d6042038d0536e78ae0d194882faf8cb50b11
| | | | | | * OpenSSLX509Certificate: mark mContext as transientKenny Root2015-05-293-1/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mContext should not participate in the serialization process, hide it with the transient qualifier. This will prevent the field from initialization during the unserialization of this class. Then of course the instance will be in a valid state. (cherry picked from commit 8d57b9dbbd883422a0ff02083bfcf637b097e504) For KLP during CTS runs, the OpenSSLX509Certificate#getContext() is not public so we have to call the function we are interested in via reflection. Bug: 21437603 Change-Id: Id5b8a83b6000c2219f3246f93aff7a9c6453f639
* | | | | | | Merge "Add VMRuntime.runFinalizationWithTimeout" into mnc-devMathieu Chartier2015-06-053-11/+47
|\ \ \ \ \ \ \
| * | | | | | | Add VMRuntime.runFinalizationWithTimeoutMathieu Chartier2015-06-053-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used by native allocations to prevent deadlocks. Bug: 21544853 Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
* | | | | | | | Ignore AndroidKeyStore in SignatureTest.Alex Klyubin2015-06-041-0/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidKeyStore* provider's Signature implementation requires special keys which cannot be created through standard JCA API. This Signature implementation is tested separately in cts/test/test/keystore. Bug: 18088752 Bug: 20912868 Change-Id: I1f134cbae0c0136a4dec937103d6fde79192948d
* | | | | | | No need to test EC keys of 192 bitsKenny Root2015-06-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EC keys of 192 bits have a security level of 96 bits which is well below accepted minimum levels according to NIST SP800 131A. No need to be able to generate these anymore. Instead test 521-bit EC keys. (cherry picked from commit 9b8f9a1bb00f70f79f175282969d428d2aade062) Bug: 20563457 Change-Id: I674c255c55c910bb8f9ccdf1e5ad7f69a2bdac69
* | | | | | | Merge "Update offered ciphers" into mnc-devKenny Root2015-06-043-150/+150
|\ \ \ \ \ \ \
| * | | | | | | Update offered ciphersKenny Root2015-06-043-150/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropped support for non-ephemeral Diffie-Hellman cipher suites, anonymous authentication, some DES cipher suites, and export cipher suites. Bug: 21522548 Change-Id: Ie2048d303890935969cc7c1ac7bc9d93705c7a90
* | | | | | | | Merge "Replace hyphen with en dash" into mnc-devKenny Root2015-06-042-112/+112
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Replace hyphen with en dashKenny Root2015-06-032-112/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is a number range, the appropriate punctuation is actually en dash. (cherry picked from commit 814e15db27ab930f59c8e6731b901a6c82b8e262) Bug: 21522548 Change-Id: I99fe4c3a45b2df00671af4b6b82b21aa2c265820
* | | | | | | | am 5d40866c: am b96afd7c: Merge "Fix for MulticastSocketTest for ↵Neil Fuller2015-06-040-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-multicast interfaces" into lollipop-cts-dev automerge: 27ef0eb * commit '5d40866c5e332c00e67384badbce29993f3db84f': Fix for MulticastSocketTest for non-multicast interfaces
| * | | | | | | am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicast ↵Neil Fuller2015-06-020-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interfaces" into lollipop-cts-dev automerge: 27ef0eb * commit 'b96afd7caf4486aa3306b62c08f43a660b5bf8f8': Fix for MulticastSocketTest for non-multicast interfaces
| | * | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into ↵Neil Fuller2015-06-021-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev automerge: 27ef0eb * commit '27ef0eb26e179b7750b9cb72018da9fab3a0bbb0': Fix for MulticastSocketTest for non-multicast interfaces
| | | * \ \ \ \ \ Merge "Fix for MulticastSocketTest for non-multicast interfaces" into ↵Neil Fuller2015-06-021-1/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev
| | | | * | | | | | Fix for MulticastSocketTest for non-multicast interfacesNeil Fuller2015-06-021-1/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_setNetworkInterfaceLjava_net_NetworkInterface does not check that the interface supports multicast. Bug: 19232216 Change-Id: I755287c06c99f36d209a3a8d11b2c75fccfa630b (cherry picked from commit f6e066e95859d3366a24da89736f487d980854ce)
* | | | | | | | | am 9cd2e604: am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into ↵Richard Uhler2015-06-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev automerge: 7feb222 * commit '9cd2e6042f2ca4088f394d8344531c9c9747ce2f': Fix problems with DexClassLoaderTest.
| * | | | | | | 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.
| | | * | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| | | |\ \ \ \ \
| | | | * | | | | 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
* | | | | | | | Merge "Configure ICU4C without relying on build-time flags" into mnc-devNeil Fuller2015-06-031-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Configure ICU4C without relying on build-time flagsNeil Fuller2015-06-031-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The presence of the build-time flags appears to cause ICU4C to open the .dat file again as a fallback if it fails to find a config value. This is even though the .dat file is explicitly mapped using udata_setCommonData(). Bug: 19960867 Bug: 19961406 (cherry-picked from commit 79fdcc64ea2d9234f258dac57f04b1017a573311) Change-Id: I03f0f2d661dd2de2b0db085519159f7deb60816d
* | | | | | | | | Improve HttpURLConnection Performance docsNeil Fuller2015-06-031-6/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21582657 Bug: https://code.google.com/p/android/issues/detail?id=174949 (cherry-picked from commit b33ae4f5857e7b9ed870336655d2b42673c69146) Change-Id: Ide0cb3ae300dbad5ae371ae7ac4fcae363ca0eba
* | | | | | | | Move mirror::ArtMethod to nativeMathieu Chartier2015-06-014-89/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19264997 (cherry picked from commit c8595cdc1bd25e5ae6c889ed9b3ab14eca68e72b) Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d
* | | | | | | | Merge "Signature2Test: calling verify a second time can throw" into mnc-devKenny Root2015-06-011-11/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Signature2Test: calling verify a second time can throwKenny Root2015-05-291-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for Signature don't guarantee that the implementation will not throw. It is perfectly fine to throw here. The original bug for which this check was added is bogus (re: https://code.google.com/p/android/issues/detail?id=34933) in that the RI behavior is clearly not the same as this test indicates with the StandardNames.IS_RI branch. (cherry picked from commit fb8371585860dd8f2321f47c490c1a622f5158ce) Bug: 18869265 Change-Id: I6e413cac85daf5b14bc20adc2279741ab11d97f6
* | | | | | | | | Add test_PacketSocketAddress to the list of known failures.Narayan Kamath2015-06-011-0/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs CAP_NET_RAW which means it can only ever run successfully as root. bug: 19764047 (cherry picked from commit 676fbcf150d23bb81da6dccd40bcd085a2eeee8a) Change-Id: I6c24cb9a781340d4c92fb53aa2670ddb99031c73
* | | | | | | | am 01f1a78b: am c039fc1e: Merge "Fix race condition in WeakHashMapTest." ↵Bill Yi2015-05-280-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 automerge: 6da6b0e automerge: 662ec05 * commit '01f1a78b2cbad6a0974bccd0b953723549921a26': Fix race condition in WeakHashMapTest.
| * | | | | | | am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into jb-dev ↵Bill Yi2015-05-280-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 automerge: 6da6b0e automerge: 662ec05 * commit 'c039fc1e1540cf8c5e8dfbe92147374936d10793': Fix race condition in WeakHashMapTest.
| | * | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: ↵Bill Yi2015-05-280-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 automerge: 6da6b0e automerge: 662ec05 * commit '662ec05ff8a5dab8b1ea557d858cd852cb54ce58': Fix race condition in WeakHashMapTest.
| | | * | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: ↵Bill Yi2015-05-280-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 automerge: 6da6b0e * commit '6da6b0e4a410cb3bbbbcf56cba742ba881ca1b47': Fix race condition in WeakHashMapTest.
| | | | * | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: ↵Bill Yi2015-05-280-0/+0
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 * commit '81598a534fe066384bb27a6add0c631a6c16b177': Fix race condition in WeakHashMapTest.
| | | | | * | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: ↵Bill Yi2015-05-280-0/+0
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62538d8 -s ours automerge: 8806a8e * commit '8806a8e8f1c5faf26329a42822b9d61c014aa1e9': Fix race condition in WeakHashMapTest.
| | | | | | * \ \ Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2015-05-280-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 62538d8 -s ours * commit '62538d84c26624c2e3336489f5c33a62e850dd66': Fix race condition in WeakHashMapTest.
| | | | | | | * \ \ Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2014-07-071-6/+12
| | | | | | | |\ \ \
| | | | | | | | * | | Fix race condition in WeakHashMapTest.Mathieu Chartier2014-07-081-6/+12
| | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition where the reference queue daemon wouldn't necessarily have processed the cleared references by the time we called WeakHashMap.size(). The race is fixed by doing a busy wait with a 5 second timeout. This should't increase the test time in the average case since the cleared weak references should be processed shortly after induceFinalization finishes. Bug: 15775475 Change-Id: Id5a532c2a9b3377641523aaed67f1b48a8ec632b (cherry picked from commit 97afbd7972a43345ea12eb442b2a4e473b03d881)
* | | | | | | | | | 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
generated by cgit v1.1 at 2025-01-27 04:16:37 +0000