summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
* am 3b175074: am 304d6981: Merge "Fix unit tests now that the "tl" -> "fil" ↵Narayan Kamath2014-07-101-11/+27
|\ | | | | | | | | | | | | hack is gone." * commit '3b175074ff82e58d6e23a03758e5f01fedd581f4': Fix unit tests now that the "tl" -> "fil" hack is gone.
| * am 304d6981: Merge "Fix unit tests now that the "tl" -> "fil" hack is gone."Narayan Kamath2014-07-101-11/+27
| |\ | | | | | | | | | | | | * commit '304d69812c6d126d23125439c1d70b6210b907a9': Fix unit tests now that the "tl" -> "fil" hack is gone.
| | * Merge "Fix unit tests now that the "tl" -> "fil" hack is gone."Narayan Kamath2014-07-091-11/+27
| | |\
| | | * Fix unit tests now that the "tl" -> "fil" hack is gone.Narayan Kamath2014-07-071-11/+27
| | | | | | | | | | | | | | | | | | | | bug: 15873165 Change-Id: I2ffe1f384e2140b31adb72d1f4eaa029a70428f0
* | | | am 82efa5dd: am dde7a735: Merge "Switch libcore to the new icu."Elliott Hughes2014-07-101-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '82efa5dddfdb3318b2c9bbf47471001607afb5e1': Switch libcore to the new icu.
| * | | am dde7a735: Merge "Switch libcore to the new icu."Elliott Hughes2014-07-101-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'dde7a735325e7d7fe1e5c71ead206673efd18e54': Switch libcore to the new icu.
| | * | Switch libcore to the new icu.Elliott Hughes2014-07-091-2/+2
| | | | | | | | | | | | | | | | Change-Id: I58ec1fafdf5524538ac14c52d561bf93d5a6c946
| * | | am eadf0519: Merge "Remove more."Elliott Hughes2014-07-084-100/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'eadf0519ebdc2e60e5c2d2fa791a2b6ed263944d': Remove more.
| | * | Remove more.Elliott Hughes2014-07-074-100/+3
| | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of f39b5ca3c6378c3c36c63889577004b9693ea9c6.) Change-Id: Idaf030cd369e728ec37df7107cd30062db899b7c
| * | | am 3f17612f: Merge "Remove."Elliott Hughes2014-07-0834-4938/+149
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3f17612f66dbf6302696b761db3f0146d07ff2de': Remove.
| | * | Remove.Elliott Hughes2014-07-0734-4938/+149
| | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of 63744c884dd4b4f4307f2b021fb894af164972af.) Change-Id: Ibf79a402e1bad98a262e380fcee3d35c127ae6d5
| * | | am 7299cf9f: Merge "Remove"Brian Carlstrom2014-07-076-270/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7299cf9fcacfe96eacd15584efb065c32be4ffee': Remove
| | * | RemoveBrian Carlstrom2014-07-076-270/+0
| | |/ | | | | | | | | | | | | | | | (cherry picked from commit 36214feb86a0963b23f34c8c63584252bd757e19) Change-Id: I96d5109c01e39255b9970f7a515ddd3575a50e56
* | | Unhide.Narayan Kamath2014-07-081-13/+0
| | | | | | | | | | | | Change-Id: I8fbc8f19fdf4a8ffbbc5d3c0a121e68f7f30162e
* | | RemoveBrian Carlstrom2014-07-076-270/+0
| | | | | | | | | | | | Change-Id: I143d0b26b116e75892223e74b6c22b6c8db05466
* | | am a92e8e0f: am ed3ee85f: Merge "Revert "Rename Arrays.ArrayList to ↵Narayan Kamath2014-07-011-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Arrays.ArrayAdapter."" * commit 'a92e8e0fa83ff37f7802bb1faef25275733facbd': Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."
| * | am ed3ee85f: Merge "Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter.""Narayan Kamath2014-07-011-3/+3
| |\ \ | | |/ | | | | | | | | | * commit 'ed3ee85f37dbe2fc4517cc296dd4a59edac558bc': Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."
| | * Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."Narayan Kamath2014-07-011-3/+3
| | | | | | | | | | | | | | | | | | This reverts commit 4b999a474eb92e0b89a34de56f3f7979fd491aa1. Change-Id: Ifd70798e74357ffe14cbc659ad49a9853b3be8c6
* | | am 7cdc5042: am f9a56a30: Merge "Rename Arrays.ArrayList to ↵Narayan Kamath2014-07-011-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Arrays.ArrayAdapter." * commit '7cdc504277a4d182bde24f3f04ce938bf0c0ea50': Rename Arrays.ArrayList to Arrays.ArrayAdapter.
| * | am f9a56a30: Merge "Rename Arrays.ArrayList to Arrays.ArrayAdapter."Narayan Kamath2014-07-011-3/+3
| |\ \ | | |/ | | | | | | | | | * commit 'f9a56a30e71e90303e47768bdde8dd4feed36279': Rename Arrays.ArrayList to Arrays.ArrayAdapter.
| | * Rename Arrays.ArrayList to Arrays.ArrayAdapter.Narayan Kamath2014-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Looking at Arrays.asList in isolation, it's easy to assume that the method returns a java.util.ArrayList instead of a private static class with the same name and different behaviour. Change-Id: Icd75a4a3d0e21c1302ca766e529172cf2de30c2c
* | | Add additional checks in ObjectInputStreamNeil Fuller2014-06-304-21/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jann Horn for reporting a bug in ObjectInputStream and sending the initial patch. Add some checks that the class of an object being deserialized still conforms to the requirements for serialization. Add some checks that the class being deserialized matches the type information (enum, serializable, externalizable) held in the stream. Delayed static initialization of classes until the type of the class has been validated against the stream content in some cases. Added more tests. Bug: 15874291 Change-Id: I0f0fe68e0d21e041c5160482113ae847c357b8f5
* | | am 0e028e62: am c41d038e: Merge "Fix System.arraycopy"Andreas Gampe2014-06-271-52/+0
|\ \ \ | |/ / | | | | | | | | | * commit '0e028e6200c1b19a4664f959f0a68b13f4973ed2': Fix System.arraycopy
| * | am c41d038e: Merge "Fix System.arraycopy"Andreas Gampe2014-06-271-52/+0
| |\ \ | | |/ | | | | | | | | | * commit 'c41d038e5f55d993b6074e1567c268fb170b6c41': Fix System.arraycopy
| | * Fix System.arraycopyAndreas Gampe2014-06-261-52/+0
| | | | | | | | | | | | | | | | | | The generic version of arraycopy does not work. Remove it. Change-Id: I524289874cfbf62ed0af3c91264180041342c3f1
* | | am d6862d90: am a9640416: Merge "Fix a faulty Julian day computation."Elliott Hughes2014-06-274-5/+62
|\ \ \ | |/ / | | | | | | | | | * commit 'd6862d909fd177b5bce85aeee600ac47f67af5ce': Fix a faulty Julian day computation.
| * | am a9640416: Merge "Fix a faulty Julian day computation."Elliott Hughes2014-06-274-5/+62
| |\ \ | | |/ | | | | | | | | | * commit 'a9640416956fac998d3a69ec05ded7eaec80dddf': Fix a faulty Julian day computation.
| | * Merge "Fix a faulty Julian day computation."Elliott Hughes2014-06-264-5/+62
| | |\
| | | * Fix a faulty Julian day computation.Elliott Hughes2014-06-264-5/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of Calendar.MILLISECONDS was wrong, as was the use of ZONE_OFFSET without DST_OFFSET. The existing code pretty much only works for the values tested in the unit test! This patch adds new tests to make up for that. I've also added calls to Calendar.clear to ensure we're not leaking SECONDS and MILLISECONDS from the Calendar instances (which get initialized to the current wall clock) into our test values. This hasn't mattered in the past, but actually does matter here because tests like isMidnight measure down to the millisecond. Bug: https://code.google.com/p/android/issues/detail?id=72356 Signed-off-by: jasper tsai <jasper3_tsai@asus.com> Signed-off-by: hellena shih <hellena_shih@asus.com> Change-Id: I7d57590a95d3f026bdf1b991e0b1ddb47ba9af37
* | | | am b33c48b4: am 906d1caa: Merge "Clarify the String.compareTo contract and ↵Elliott Hughes2014-06-271-0/+67
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | add tests." * commit 'b33c48b4228c2bf3bd3ffbb7e80122b3f6dff928': Clarify the String.compareTo contract and add tests.
| * | | am 906d1caa: Merge "Clarify the String.compareTo contract and add tests."Elliott Hughes2014-06-271-0/+67
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '906d1caac9ab8c8b108ed4be244ba4eee58739e5': Clarify the String.compareTo contract and add tests.
| | * | Merge "Clarify the String.compareTo contract and add tests."Elliott Hughes2014-06-261-0/+67
| | |\ \
| | | * | Clarify the String.compareTo contract and add tests.Elliott Hughes2014-06-261-0/+67
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our use of vague terms like "negative" and "positive" led VM engineers to assume they had more leeway than they actually do. While we're here, let's fix all the ambiguous use of 'character' and add a warning and link to Collator anywhere the non-standard (and non-locale-specific) case folding is used. Change-Id: I0a0fb2a493861d32fac0bc4e28ae9634f8ac342c
* | | | am e9c531e9: am 57d2d897: Merge "Fixed build for arraycopy with objects."Jeff Hao2014-06-261-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e9c531e9a4bd4b1346f08b59044c763ae1fb3175': Fixed build for arraycopy with objects.
| * | | am 57d2d897: Merge "Fixed build for arraycopy with objects."Jeff Hao2014-06-261-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '57d2d897b8dccee54ee88fdf8e851b15f8a35d2a': Fixed build for arraycopy with objects.
| | * | Merge "Fixed build for arraycopy with objects."Jeff Hao2014-06-261-3/+3
| | |\ \
| | | * | Fixed build for arraycopy with objects.Emma Meersman2014-06-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled arraycopy to call native code when passed two objects. Change-Id: I77f9455550acc53ab59ec2dc85cb1fe4d75583c9
* | | | | am fd2ca69a: am 42a6d80d: Merge "Expanded arraycopy function to deal with ↵Jeff Hao2014-06-261-2/+427
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | more types and updated benchmarking." * commit 'fd2ca69a09c4efe76244f2fcf2612a0ff8b82d08': Expanded arraycopy function to deal with more types and updated benchmarking.
| * | | | am 42a6d80d: Merge "Expanded arraycopy function to deal with more types and ↵Jeff Hao2014-06-261-2/+427
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | updated benchmarking." * commit '42a6d80d91d8f33162b8946e6fc05e8b43833ca7': Expanded arraycopy function to deal with more types and updated benchmarking.
| | * | | Merge "Expanded arraycopy function to deal with more types and updated ↵Jeff Hao2014-06-261-2/+427
| | |\ \ \ | | | |/ / | | | | | | | | | | benchmarking."
| | | * | Expanded arraycopy function to deal with more types and updated benchmarking.Emma Meersman2014-06-231-2/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runs 48% faster on average for short arrays of length 16-128, depending on the type. Defaults to native code for longer arrays. Bug: 7103825 Change-Id: I70ca8f4a379600917e5bc103364af0637f18e03a
* | | | | am ca6fa02b: am 236f03fd: Merge "Don\'t return NULL as a jint."Ian Rogers2014-06-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ca6fa02b3f2bd5d9d30143e9318601258846097e': Don't return NULL as a jint.
| * | | | am 236f03fd: Merge "Don\'t return NULL as a jint."Ian Rogers2014-06-251-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '236f03fdc589f800623f1830ff1aa2b640c6a1ef': Don't return NULL as a jint.
| | * | | Don't return NULL as a jint.Ian Rogers2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build fix. Change-Id: I49a566c3c34d2040e092689e52b0039c8195de03
* | | | | Merge "@hide."Elliott Hughes2014-06-2313-14/+0
|\ \ \ \ \
| * | | | | @hide.Elliott Hughes2014-06-2213-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d266414cb6ef7bc2785d9ccb9b4f672c04c781d
* | | | | | am 3a47dee2: am cb821758: Merge "Build fix: Remove reference to deleted ↵Neil Fuller2014-06-231-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | java_io_Console function" * commit '3a47dee23bc298f8814089b9590e59c46ad6b347': Build fix: Remove reference to deleted java_io_Console function
| * | | | | am cb821758: Merge "Build fix: Remove reference to deleted java_io_Console ↵Neil Fuller2014-06-231-1/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | function" * commit 'cb8217586ab2f6d88d75a563cbfb7cd57e746bd3': Build fix: Remove reference to deleted java_io_Console function
| | * | | | Merge "Build fix: Remove reference to deleted java_io_Console function"Neil Fuller2014-06-201-1/+0
| | |\ \ \ \
| | | * | | | Build fix: Remove reference to deleted java_io_Console functionNeil Fuller2014-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was deleted by 1f3014901704f3ae81538773b8a0b382945adc8d Bug: 12491103 Change-Id: If75f1f05d6a72cac7b7a86b7616bae870615452e
generated by cgit v1.1 at 2025-03-29 15:13:01 +0000