summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Return IvParameters in OpenSSLCipher#getParametersKenny Root2013-09-112-9/+100
| | | | | | | | | | | | | The getParameters() call was unimplemented in the OpenSSLCipher as an oversight. Add it so code relying on it will continue to work. Additionally add tests for getIV() and getParameters() to make sure they work correctly. (cherry picked from commit 8d59a14a150738b8b3a2a8c31d1a48b8ae0a3d0c) Bug: 10423926 Change-Id: I6bc7fc540509242dff9e5411f66f82be54691cb4
* Merge "Add API to get a time zone's localized exemplar location from CLDR."Elliott Hughes2013-09-113-0/+30
|\
| * Add API to get a time zone's localized exemplar location from CLDR.Elliott Hughes2013-09-103-0/+30
|/ | | | | | Bug: 8145760 Bug: 10179879 Change-Id: Idafa81402c8d89cc2756ab1d57c0f8b1b3401df7
* Merge "Some cleanup while investigating test_SSLSocket_interrupt"Brian Carlstrom2013-09-101-53/+114
|\
| * Some cleanup while investigating test_SSLSocket_interruptBrian Carlstrom2013-09-101-53/+114
|/ | | | | Bug: 10681815 Change-Id: If9a76f4c55b578c6f135befebcc443ab9aef3073
* Merge "Fixed interruption of blocked SSLSocket via Socket.close()"Brian Carlstrom2013-09-102-40/+30
|\
| * Fixed interruption of blocked SSLSocket via Socket.close()Brian Carlstrom2013-09-102-40/+30
| | | | | | | | | | | | | | | | Bug: 10599593 (cherry picked from commit 3f17b9a79c4331504f32d34ce46adf7a78870f87) Change-Id: I1bffa8189d64aa8ee0aa1ac414359aecb71934a5
* | Merge "Delay SSLSocketImpl instantiation until needed"Kenny Root2013-09-105-15/+29
|\ \
| * | Delay SSLSocketImpl instantiation until neededKenny Root2013-09-105-15/+29
|/ / | | | | | | | | | | | | | | | | | | | | Class preloading will create an instance of objects if they are in static fields, so put the ones we don't want instantiated into a holder class that is not preloaded. (cherry picked from commit da5b7116b58795b169961cbd63c2b21bac741d9a) Bug: 9984058 Change-Id: If8cb4280cbee79cd4d479fbf6a5297c8e5569b6c
* | Merge "Make sure AlgNameMapper has the latest name version"Kenny Root2013-09-101-10/+24
|\ \
| * | Make sure AlgNameMapper has the latest name versionKenny Root2013-09-101-10/+24
|/ / | | | | | | | | | | | | | | | | | | | | | | In the current design, if AlgNameMapper's class initialization is run too early, the data will be incomplete. This change uses the Services's cache versioning system to check when it should update its internal cache ensuring it's never out of date. (cherry picked from commit 6243428ca4ba6d9d767070bbe2d5c480bbcd0669) Bug: 10666722 Change-Id: I70dd09cf77145bd98f84279e58ed20cb9cef8341
* | Merge "Use sk_FOO_pop_free instead of sk_FOO_free"Kenny Root2013-09-101-4/+5
|\ \ | |/ |/|
| * Use sk_FOO_pop_free instead of sk_FOO_freeKenny Root2013-09-101-4/+5
|/ | | | | | | | | | | | | The proper way to free a stack of owned "FOO" items is to use sk_FOO_pop_free since that will iterate through all the FOO instances in the stack and free them. Calling sk_FOO_free just frees the stack and not the items. (cherry picked from commit 64299318644c0c6b86992d414e68d0af236b52c5) Bug: 10610037 Bug: http://code.google.com/p/android/issues/detail?id=59536 Change-Id: I8af603b10219acb476666e77cc776b6936a19f8d
* Merge "Add a regression test for an already-fixed formatDateRange bug."Elliott Hughes2013-09-101-0/+19
|\
| * Add a regression test for an already-fixed formatDateRange bug.Elliott Hughes2013-09-091-0/+19
|/ | | | | Bug: 8467515 Change-Id: I37fe971c1136301d2cc29bd6bc321133dbe50f5e
* Merge "Fix a bug in DateFormat, clean up some SimpleDateFormat tests."Elliott Hughes2013-09-103-485/+222
|\
| * Fix a bug in DateFormat, clean up some SimpleDateFormat tests.Elliott Hughes2013-09-093-485/+222
|/ | | | | | | | | | | | | | | | | | | | | | We failed a couple of tests because of an assumption about the default time zone: junit.framework.AssertionFailedError: Wrong format: " d" expected: 12 result: 11 at java.text.SimpleDateFormatTest.test(SimpleDateFormatTest.java:55) at org.apache.harmony.tests.java.text.SimpleDateFormatTest.test_formatLjava_util_DateLjava_lang_StringBufferLjava_text_FieldPosition(SimpleDateFormatTest.java:347) junit.framework.AssertionFailedError: Wrong result: h input: 12 expected: Thu Jan 01 00:00:00 UTC 1970 result: Thu Jan 01 08:00:00 UTC 1970 at java.text.SimpleDateFormatTest.parse(SimpleDateFormatTest.java:86) at org.apache.harmony.tests.java.text.SimpleDateFormatTest.test_parseLjava_lang_StringLjava_text_ParsePosition(SimpleDateFormatTest.java:546) Cleaning up the tests and merging OldSimpleDateFormatTest into SimpleDateFormatTest accidentally made one of our tests more strict, at which point it failed because we weren't updating the FieldPosition for 'z' or 'Z' when formatting or parsing. So this patch fixes that by mapping the DateFormat.Field to the appropriate int for Calendar. Change-Id: If4b2f2c02d8ccd50d96d77df3b60e1c1d65ae666
* Merge "Clean up useless comments in MatcherTest."Elliott Hughes2013-09-091-69/+16
|\
| * Clean up useless comments in MatcherTest.Elliott Hughes2013-09-091-69/+16
|/ | | | Change-Id: I921a8e1edb1d2aa596325cf03c04196328b3930b
* Merge "Remove StaticAssert.h."Elliott Hughes2013-09-073-31/+1
|\
| * Remove StaticAssert.h.Elliott Hughes2013-09-063-31/+1
|/ | | | | | The switch to C++11 means we have static_assert now. Change-Id: Iaa39af8c4fa7143fc83fda550543eb3270f9f161
* Merge "Fix formatDateRange's decisions about when to show a year."Elliott Hughes2013-09-072-56/+150
|\
| * Fix formatDateRange's decisions about when to show a year.Elliott Hughes2013-09-062-56/+150
| | | | | | | | | | Bug: 10209343 Change-Id: Id386e9ee4acf46ce3b4d0802b4aca49a0b0667cb
* | Merge "Register Conscrypt as the AlgNameMapper source"Kenny Root2013-09-073-37/+58
|\ \
| * | Register Conscrypt as the AlgNameMapper sourceKenny Root2013-09-063-37/+58
|/ / | | | | | | | | | | | | | | | | | | | | Conscrypt was moved out of libcore, so the call directly to NativeCrypto was removed as well. To break the dependency, introduce an interface that Conscrypt registers as to answer algorithm name to OID mapping queries and vice versa. (cherry picked from commit b6963ac272834ec5f791ecdc773d17cb156e23f0) Bug: 10310296
* | Merge "Make sure ChannelID key is initialized"Kenny Root2013-09-061-0/+2
|\ \
| * | Make sure ChannelID key is initializedKenny Root2013-09-061-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | This test used the test ChannelID key, but it didn't make sure it was initialized first. This made it appear sometimes depending on the order the tests were executed. (cherry picked from commit debfff83084b79b65c092cfe72ebea9d9a9548d6) Bug: 10210673 Change-Id: I5212e265611208ecb641a7d6b403985df603cb03
* | Merge "Register Conscrypt as the AlgNameMapper source"Kenny Root2013-09-064-2/+89
|\ \ | |/ |/|
| * Register Conscrypt as the AlgNameMapper sourceKenny Root2013-09-064-2/+89
| | | | | | | | | | | | | | | | | | | | | | | | Conscrypt was moved out of libcore, so the call directly to NativeCrypto was removed as well. To break the dependency, introduce an interface that Conscrypt registers as to answer algorithm name to OID mapping queries and vice versa. (cherry picked from commit 6fcfb5a75dfb595ccbcf0a7a576ee7515fe2da32) Bug: 10310296 Change-Id: Ia9c802f1102df7209749a90d0ed3ed2831480b04
* | Merge "Call SSL_use_certificate before SSL_use_PrivateKey"Brian Carlstrom2013-09-061-3/+5
|\ \ | |/ |/|
| * Call SSL_use_certificate before SSL_use_PrivateKeyBrian Carlstrom2013-08-291-3/+5
| | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=54433 Change-Id: Icf39b98802e2c6128e79c44eaf2cabc7b4805cc5
* | Merge "Fix formatDateRange's handling of all-day events."Elliott Hughes2013-09-062-5/+64
|\ \
| * | Fix formatDateRange's handling of all-day events.Elliott Hughes2013-09-052-5/+64
|/ / | | | | | | | | | | | | | | | | Android's formatDateRange's interpretation of a time span running until 0 ms into a day is different from icu4c. Traditionally we didn't count that as being the next day, but icu4c does. Bug: 10560853 Change-Id: I99fbbf19ad98147c9c4ff568231aec71d97a8938
* | Merge "More java.text test cleanup/fixes."Elliott Hughes2013-09-053-1045/+460
|\ \
| * | More java.text test cleanup/fixes.Elliott Hughes2013-09-043-1045/+460
|/ / | | | | | | | | | | | | | | | | I investigated http://bugs.icu-project.org/trac/ticket/10353 further and decided it's WAI, so we can remove a TODO implying that icu4c was incorrect. Also merge the remaining OldDecimalFormatTest tests, removing duplication. Change-Id: I1941dd1bef3b5eae258960ca8a5fcd2e7de0c926
* | Merge "Only use public API for icu4c's FieldPositionIterator."Elliott Hughes2013-09-043-106/+43
|\ \
| * | Only use public API for icu4c's FieldPositionIterator.Elliott Hughes2013-09-043-106/+43
|/ / | | | | | | Change-Id: I247f7c644537b8e9f67f4f27360ce1449fa04300
* | Merge "Don't abbreviate 24-hour times."Elliott Hughes2013-09-042-85/+128
|\ \
| * | Don't abbreviate 24-hour times.Elliott Hughes2013-09-032-85/+128
|/ / | | | | | | | | Bug: 10318326 Change-Id: Ifbd50a994e30ce11e060eebd0bf6b8f428c1264d
* | Merge "Fix memory leak when using DateTimePatternGenerator"Elliott Hughes2013-09-031-1/+1
|\ \
| * | Fix memory leak when using DateTimePatternGeneratorCarton He2013-09-031-1/+1
|/ / | | | | | | | | | | | | | | Instance created by DateTimePatternGenerator::createInstance() needs to be deleted Change-Id: I3e6058f717e56dbc06ffaca35ff6ae06059b689d Signed-off-by: Carton He <carton.he@marvell.com>
* | Merge "Remove some unnecessary native code for LocaleData."Elliott Hughes2013-09-032-29/+7
|\ \
| * | Remove some unnecessary native code for LocaleData.Elliott Hughes2013-09-032-29/+7
|/ / | | | | | | | | | | | | We already have a more general implementation, exposed as public API >= jb-mr2. Change-Id: I917465f6bac4afec40e3685dccffad920d050c85
* | Merge "Use getLocale more consistently."Elliott Hughes2013-09-031-2/+2
|\ \
| * | Use getLocale more consistently.Elliott Hughes2013-09-031-2/+2
|/ / | | | | | | Change-Id: I64d9e651aba3b2872a23e4d4b1b7c32c34f86d90
* | Merge "Increase wait time for test_SSLSocket_interrupt_case"Brian Carlstrom2013-09-031-1/+1
|\ \
| * | Increase wait time for test_SSLSocket_interrupt_caseBrian Carlstrom2013-09-031-1/+1
|/ / | | | | | | | | | | | | | | Bug: 10599593 (cherry picked from commit a96049c03db95fd46583ac917f221791cf7d08dc) Change-Id: Ifd5cfe1134a246671da0d1729b635b1f091ea3c6
* | Merge "Add getLastAccessedTime logging for flakey ↵Brian Carlstrom2013-09-031-1/+3
|\ \ | | | | | | | | | test_SSLSocket_TestSSLSessions_create test case"
| * | Add getLastAccessedTime logging for flakey ↵Brian Carlstrom2013-09-011-1/+3
|/ / | | | | | | | | | | | | test_SSLSocket_TestSSLSessions_create test case Bug: 10577514 Change-Id: I867fc6f852a47fb299e82fff2870c136cc58cbdb
* | Merge "Fix a DecimalFormat crash when formatting the empty string."Elliott Hughes2013-09-012-13/+11
|\ \
generated by cgit v1.1 at 2025-03-14 20:26:15 +0000