summaryrefslogtreecommitdiffstats
path: root/luni/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-221-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ccb61deb8f478f91404b75cbe19cb7b9cbcb4f76': Move java.nio.Charsets to libcore.util.
| * | | Move java.nio.Charsets to libcore.util.Narayan Kamath2015-04-221-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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
* | | am 9cd55497: am 298bf64c: Merge "X509Certificate: Narrow down the scope of ↵Narayan Kamath2015-04-221-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | caught exceptions." * commit '9cd55497d16cc2d8888dd204b5b63ace0645fa06': X509Certificate: Narrow down the scope of caught exceptions.
| * | 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
* | | am 4d818829: am 72f2eb7f: Merge "Fix Class.forName(..., ..., null) to pass ↵Brian Carlstrom2015-04-222-13/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | 068-classloader\'s testClassForName" * commit '4d81882996127ca855eacde8517a7c414746530e': Fix Class.forName(..., ..., null) to pass 068-classloader's testClassForName
| * | 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
* | | am 36fc8b3c: am 7e59d13c: Merge "Return unlocalized TimeZoneID from ↵Narayan Kamath2015-04-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | TimeZone.getTimeZone()" * commit '36fc8b3cf165c84666cf8cdab72789e3547117ca': Return unlocalized TimeZoneID from TimeZone.getTimeZone()
| * | Return unlocalized TimeZoneID from TimeZone.getTimeZone()Taiju Tsuiki2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 69773bd2: am 21a0e54a: Merge "Remove support for reading mime types from ↵Narayan Kamath2015-04-211-61/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | property files." * commit '69773bd217466a536c9317073a184d3907f58100': Remove support for reading mime types from property files.
| * | 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
* | | am 92959e75: am 13867636: Merge "Implement mapLibraryName in Java."Elliott Hughes2015-04-161-1/+6
|\ \ \ | |/ / | | | | | | | | | * commit '92959e7581da88c897596e63098365db8663d3c6': Implement mapLibraryName in Java.
| * | Merge "Implement mapLibraryName in Java."Elliott Hughes2015-04-161-1/+6
| |\ \
| | * | Implement mapLibraryName in Java.Elliott Hughes2015-04-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | No need for native code here. Change-Id: Iaeb0369b5638a6681fd94fd999641801719aaea2
* | | | am b059489d: am 83f2b5f3: Merge "Use ICU4J more in DateIntervalFormat and ↵Neil Fuller2015-04-162-85/+85
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | RelativeDateTimeFormatter" * commit 'b059489d9b120279eff706efda839ff719e722e0': Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatter
| * | | Merge "Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatter"Neil Fuller2015-04-162-85/+85
| |\ \ \ | | | |/ | | |/|
| | * | Use ICU4J more in DateIntervalFormat and RelativeDateTimeFormatterNeil Fuller2015-04-162-85/+85
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 4b915681: am 81347df7: Merge "Make Manifest#clone obey clone\'s contract."Narayan Kamath2015-04-161-6/+20
|\ \ \ | |/ / | | | | | | | | | * commit '4b915681b32df299c93c2cd0a9911deba0ecdebd': Make Manifest#clone obey clone's contract.
| * | 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
* | | am 85a9d24b: am d4884a61: Merge "Fix bad negation in Collections#binarySearch."Narayan Kamath2015-04-161-16/+16
|\ \ \ | |/ / | | | | | | | | | * commit '85a9d24be7cc35e5a5015084c870d1046e6d3100': Fix bad negation in Collections#binarySearch.
| * | Fix bad negation in Collections#binarySearch.Narayan Kamath2015-04-161-16/+16
| |/ | | | | | | | | bug: 19749094 Change-Id: Id1d7bcf4abebb423fd3bbb7c8f379bf9e6234969
* | am c5546c4c: am 0ed6c7db: Merge "Switch ↵Neil Fuller2015-04-142-111/+85
|\ \ | |/ | | | | | | | | | | DateIntervalFormat/RelativeDateTimeFormatter to ICU4J" * commit 'c5546c4c0812bba9d9a6b0611839465b9fd4eab6': Switch DateIntervalFormat/RelativeDateTimeFormatter to ICU4J
| * Switch DateIntervalFormat/RelativeDateTimeFormatter to ICU4JTravis Keep2015-04-142-111/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Information below from the existing benchmarks on a hammerhead. All times given in microseconds. Note that the new version is slower, but this is a small difference in absolute terms and means less maintenance for libcore. The ICU team is rewriting some of the underlying code in ICU4J for a future ICU release which may alter performance. ICU4C + JNI DateIntervalFormat_formatDateRange_DATE 67.8 DateIntervalFormat_formatDateRange_DATE_TIME 76.0 DateIntervalFormat_formatDateRange_TIME 54.8 ICU4J DateIntervalFormat_formatDateRange_DATE 179 DateIntervalFormat_formatDateRange_DATE_TIME 181 DateIntervalFormat_formatDateRange_TIME 167 ICU4C + JNI RelativeDateTimeFormatter_getRelativeDateTimeString 151.6 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 169.0 RelativeDateTimeFormatter_getRelativeTimeSpanString 27.8 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 27.7 ICU4J RelativeDateTimeFormatter_getRelativeDateTimeString 366.5 RelativeDateTimeFormatter_getRelativeDateTimeString_ABBREV 377.6 RelativeDateTimeFormatter_getRelativeTimeSpanString 23.2 RelativeDateTimeFormatter_getRelativeTimeSpanString_ABBREV 22.9 Bug: 20127691 Change-Id: I1ebc08fd9c974743026ae1e6c848fb4de8aa0e48
* | am 6ed782c4: am 29ee0563: Merge "StrictJarFile: better handle missing files"Nick Kralevich2015-04-141-0/+7
|\ \ | |/ | | | | | | * commit '6ed782c48847bb817e123edc0c0eb081e905b8a8': StrictJarFile: better handle missing files
| * StrictJarFile: better handle missing filesNick Kralevich2015-04-141-0/+7
| | | | | | | | | | | | | | Ensure all manifest files are present in the jar. Bug: 1162500 Change-Id: I36b40a34d5837b8ad4a0d13e7ea2e37ad7e51f3b
* | am a7d04d7e: am 5b398cac: Merge "Refactor security classes for static ↵Andreas Gampe2015-04-132-13/+45
|\ \ | |/ | | | | | | | | | | initialization" * commit 'a7d04d7ecfa0e9036a2718432f58df77d7ae153a': Refactor security classes for static initialization
| * Refactor security classes for static initializationKenny Root2015-04-132-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split out security.properties I/O to a separate method returning a Reader. This method can be intercepted at compile-time and provide a StringReader with the content of the file. A reader is necessary as Properties interally uses a reader and requires a Charset to translate from an input-stream. Refactor Services provider loading to first try the boot classpath loader instead of the system class-loader. The former is accessible during compile-time initialization and functionally equivalent. Bug: 19498458 Bug: 19542228 Change-Id: I853952b83ca99006907c070734f767259c975517
* | am d65a3c71: am a936d452: Merge "Libcore: Refactor TimeZone for compile-time ↵Andreas Gampe2015-04-131-36/+46
|\ \ | |/ | | | | | | | | | | initialization" * commit 'd65a3c71d7af3ae097f0722fba6be80f057b3d18': Libcore: Refactor TimeZone for compile-time initialization
| * Libcore: Refactor TimeZone for compile-time initializationAndreas Gampe2015-04-131-36/+46
| | | | | | | | | | | | | | | | | | | | | | Introduce a private inner class for custom-time-zone parsing. This moves the Pattern field which cannot be compile-time initialized. As a result, TimeZone, SimpleTimeZone & ZoneInfo can be initialized in the boot image. Bug: 19542228 Change-Id: I6fc8cb65975e14351a6bfc1ddfac175368efd1eb
* | am 2fe35a74: am f77b10a0: Merge "Libcore: Make Date compile-time initializable"Andreas Gampe2015-04-131-2/+5
|\ \ | |/ | | | | | | * commit '2fe35a74d664529404991d6883b34e24d41cc417': Libcore: Make Date compile-time initializable
| * Libcore: Make Date compile-time initializableAndreas Gampe2015-04-101-2/+5
| | | | | | | | | | | | | | Move CREATION_YEAR to a static inner class. Bug: 19542228 Change-Id: I3db699f8ad661305f5255ee730faeb21c2861dde
* | am b9a96e76: am 4298c47c: Merge "Make ICU4J look for timezone updates in /data"Neil Fuller2015-04-091-1/+33
|\ \ | |/ | | | | | | * commit 'b9a96e76f5ae9631faa16046494f1fc63e84df76': Make ICU4J look for timezone updates in /data
| * Make ICU4J look for timezone updates in /dataNeil Fuller2015-04-091-1/+33
| | | | | | | | | | Bug: 19941636 Change-Id: I4dbadfbfd4a8fbfeb3d580c073061710fd521fdd
* | am 48cb3cb0: am 8c92f020: Merge "Small documentation changes to System"Neil Fuller2015-04-081-4/+6
|\ \ | |/ | | | | | | * commit '48cb3cb0072bff1defe6eb7a309971bddd36bbc8': Small documentation changes to System
| * Small documentation changes to SystemNeil Fuller2015-04-081-4/+6
| | | | | | | | | | | | Updates to documentation around lineSeparator. Change-Id: I0b646c06ac85303e572e38738889a8247eef37a0
* | am 71a8b3bd: am 58894095: Merge "Rename package to android.icu.* instead of ↵Narayan Kamath2015-04-081-1/+1
|\ \ | |/ | | | | | | | | | | com.android.ibm.icu.*." * commit '71a8b3bdbd3e1f6cdaedcea8b2db3e116c674793': Rename package to android.icu.* instead of com.android.ibm.icu.*.
| * Rename package to android.icu.* instead of com.android.ibm.icu.*.Narayan Kamath2015-04-071-1/+1
| | | | | | | | | | | | Based on a discussion with the icu team. Change-Id: I47a6b260a9348debd65282794996f7976b8bc008
* | am 8426170b: am 345d118d: Merge "Changes to enable timezone data overrides ↵Neil Fuller2015-04-071-1/+2
|\ \ | |/ | | | | | | | | | | for ICU and libcore" * commit '8426170b2440ce9d9857f8b63e5de5f77d7ee393': Changes to enable timezone data overrides for ICU and libcore
| * Merge "Changes to enable timezone data overrides for ICU and libcore"Neil Fuller2015-04-071-1/+2
| |\
| | * Changes to enable timezone data overrides for ICU and libcoreNeil Fuller2015-03-261-1/+2
| | | | | | | | | | | | | | | Bug: 19941636 Change-Id: Id587be99f645978c2e1067c9f8eef26d6d63ec27
* | | am 3a5bda4d: am e2588119: Merge "GZIPInputStream: Correctly handle extras in ↵Narayan Kamath2015-04-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | gzip headers." * commit '3a5bda4dd753ec70609116a5da4965c88126d275': GZIPInputStream: Correctly handle extras in gzip headers.
| * | GZIPInputStream: Correctly handle extras in gzip headers.Narayan Kamath2015-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | We were peeking into the wrong field for the extra length. bug: https://code.google.com/p/android/issues/detail?id=159340 Change-Id: Ib7ed400e3e119b1d6c95be49d25812c5c7f366b9
* | | am 8eb6471d: am 0e727b80: Merge "Expose getSpi from crypto operations as ↵Alex Klyubin2015-04-034-4/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | hidden API." * commit '8eb6471d592d3583905d7693d4616cb8a4f41764': Expose getSpi from crypto operations as hidden API.
| * | Merge "Expose getSpi from crypto operations as hidden API."Alex Klyubin2015-04-034-4/+22
| |\ \
| | * | Expose getSpi from crypto operations as hidden API.Alex Klyubin2015-03-244-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for platform code to obtain the current SPI implementation of Cipher, Signature, Mac, and KeyAgreement instances. The current use case is to access additional information about these crypto operations when they are backed by Android KeyStore. NOTE: The getSpi API will not and cannot become public framework API. Bug: 18088752 Change-Id: If575726d288eebc73ffa3209c316fad071a087fd
* | | | am d42442e6: am e54ee76f: Merge "GZIPInputStream: Fix handling of header CRCs."Narayan Kamath2015-04-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd42442e615b81e0ef28414d985174717047cca5e': GZIPInputStream: Fix handling of header CRCs.
| * | | GZIPInputStream: Fix handling of header CRCs.Narayan Kamath2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same mistake as public bug 159340, we were peeking in the wrong buffer for the CRC. Note that this is different from the member CRC, the latter is the CRC of the actual data (not the header) and is mandatory. Change-Id: I98d49bdd9d5ea93fe982783c8077531764ee5347
* | | | am 39197570: am f640e5b7: Merge "Don\'t use zip64 by default."Narayan Kamath2015-04-031-7/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3919757028a08903e4c3101f5cacbfae40c201bd': Don't use zip64 by default.