summaryrefslogtreecommitdiffstats
path: root/luni/src/main
Commit message (Collapse)AuthorAgeFilesLines
* libcore: throw InvalidKeyException instead of ProviderExceptionSergio Giro2015-06-094-55/+145
| | | | | | | | | | | | 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
* Add VMRuntime.runFinalizationWithTimeoutMathieu Chartier2015-06-052-11/+22
| | | | | | | Used by native allocations to prevent deadlocks. Bug: 21544853 Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
* Update offered ciphersKenny Root2015-06-042-102/+102
| | | | | | | | Dropped support for non-ephemeral Diffie-Hellman cipher suites, anonymous authentication, some DES cipher suites, and export cipher suites. Bug: 21522548 Change-Id: Ie2048d303890935969cc7c1ac7bc9d93705c7a90
* 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
* 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
* Don't throw UnsupportedOpEx on multi-char negative/percent symbols.Narayan Kamath2015-05-281-3/+17
| | | | | | | | | | | | | 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
* Serialize minusSign/percentSign as strings in DecimalFormatSymbols.Narayan Kamath2015-05-271-4/+28
| | | | | | | | | | | | 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
* 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 "Get rid of old Harmony Services cache" into mnc-devKenny Root2015-05-193-65/+33
|\
| * Get rid of old Harmony Services cacheKenny Root2015-05-193-65/+33
| | | | | | | | | | | | | | | | | | | | | | | | 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
* 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-132-10/+45
| | | | | | | Bug: 19493779 (cherry-picked from commit f547d3aa155a20cfc7cb9852f595ce0806bd1198) Change-Id: I71c7c143386aa4d805b6f1418b72573ddec05dec
* Fix a couple of Locale bugs discovered by ICU4J tests.Narayan Kamath2015-05-121-6/+28
| | | | | | | | | | | | | | | | | 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-121-1/+1
| | | | | | | | | | | | | | | | | | | 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
* 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
* 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
* | am 3bb83381: Add a ZoneInfoDB.hasTimeZone API.Narayan Kamath2015-04-301-0/+4
|\ \ | |/ | | | | | | * commit '3bb833819dba8d530620ad6d43dc53c3fd54763b': Add a ZoneInfoDB.hasTimeZone API.
| * Add a ZoneInfoDB.hasTimeZone API.Narayan Kamath2015-04-301-0/+4
| | | | | | | | | | | | | | | | | | Allows us to query the DB without having to clone an object or an entire strings array. bug: 19106773 bug: 19987403 Change-Id: I66d466e414972b02a75bcfe68263e74de8b9a768
| * 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 834566b1: Merge "Update JSR-166 to Revision 1.43"Narayan Kamath2015-04-2954-457/+708
|\ \ | | | | | | | | | | | | * commit '834566b144399db3c3cdd744963b8e5eeb19e6c4': Update JSR-166 to Revision 1.43
| * | Update JSR-166 to Revision 1.43Narayan Kamath2015-04-2954-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 Change-Id: Iead730222b4376f947e7dc05b0acaf608eccf238
* | | am 3f4c8d19: Merge "Remove libcore_util_CharsetUtils.cpp"Narayan Kamath2015-04-281-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3f4c8d19267ddaf6790660054366df5eeb1c5582': Remove libcore_util_CharsetUtils.cpp
| * | Remove libcore_util_CharsetUtils.cppNarayan Kamath2015-04-281-0/+0
| | | | | | | | | | | | | | | | | | | | | For some reason, this was made empty but not removed in 83c7414449bc406b. Change-Id: I9a2b613d2281db450e46aa824ce3a6a865fddb8c
* | | am 930025e2: Merge "Date.toString must always use Locale.US."Narayan Kamath2015-04-281-10/+12
|\ \ \ | |/ / | | | | | | | | | * commit '930025e26a243235f02b30f97c5c5e378e1334e1': Date.toString must always use Locale.US.
| * | Date.toString must always use Locale.US.Narayan Kamath2015-04-281-10/+12
| | | | | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=81924 Change-Id: Id5e0ec6514f159d548617e5d9946088078b89afa
* | | am 39f72b16: Merge "Removed offset and value from String and added ↵Jeff Hao2015-04-286-1369/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | StringFactory." * commit '39f72b16952fbe4aff5c2e080ce9f7f6dbb1b93d': Removed offset and value from String and added StringFactory.
| * | Merge "Removed offset and value from String and added StringFactory."Jeff Hao2015-04-286-1369/+13
| |\ \
| | * | Removed offset and value from String and added StringFactory.Jeff Hao2015-04-276-1369/+13
| | | | | | | | | | | | | | | | Change-Id: I55314ceb906d0bf7e78545dcd9bc3489a5baf03f
* | | | am 824b1cd0: Merge "Ensure proper integer promotion for bit shifts."Dan Albert2015-04-271-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '824b1cd012662cfa16a8787bf908a0b5fb13e54b': Ensure proper integer promotion for bit shifts.
| * | Ensure proper integer promotion for bit shifts.Dan Albert2015-04-271-2/+2
| |/ | | | | | | | | | | | | Previously this was a 32-bit value being shifted up to 63 bits, which is undefined behavior. Change-Id: I99bb38508937f7a33d5c2c841b7cc32d5f374ef9
* | am 8c95e178: am 2b7e589a: Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-242-12/+7
|\ \ | |/ | | | | | | * commit '8c95e17836c652ea89d5bfa94feab4396c332f6e': Tidy up Package and classloader comments
| * Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-242-12/+7
| |\
| | * Tidy up Package and classloader commentsNeil Fuller2015-04-222-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | 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-241-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | FileChannel when closing the RAF" * commit 'd3f115a1c42e73b4759cc049fa7114439b847162': 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-241-1/+4
| |\ \ | | | | | | | | | | | | RAF"
| | * | java/io/RandomAccessFile: do not nullify FileChannel when closing the RAFSergio Giro2015-04-221-1/+4
| | |/ | | | | | | | | | | | | | | | | | | 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-234-212/+305
|\ \ \ | |/ / | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit 'bd7c7451634fa46aef554dd6e09421ce2d6033a6': Ensure consistency of capitalization in RelativeDateTimeFormatter
| * | Merge "Ensure consistency of capitalization in RelativeDateTimeFormatter"Neil Fuller2015-04-234-212/+305
| |\ \
| | * | Ensure consistency of capitalization in RelativeDateTimeFormatterNeil Fuller2015-04-224-212/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ccb61deb: am 97ca5855: Merge "Move java.nio.Charsets to libcore.util."Narayan Kamath2015-04-224-7/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ccb61deb8f478f91404b75cbe19cb7b9cbcb4f76': Move java.nio.Charsets to libcore.util.
| * | | 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