summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* API to query whether a given instruction set / abi is 64bit.Narayan Kamath2014-07-141-0/+11
| | | | | | | | | This is required to implement some aspects of the multi lib installation process. (cherry picked from commit 32f32721e65c93a3aaf8a792b7742aabe7e29e7e) Change-Id: I10fedcbee1318d132d2ac517ddf8cdca02a51cda
* Merge "Remove JavaSQLite & JUnit licenses."Narayan Kamath2014-07-101-276/+0
|\
| * Remove JavaSQLite & JUnit licenses.Narayan Kamath2014-07-141-276/+0
| | | | | | | | | | | | | | | | | | Code has moved to separate projects, each with their own NOTICE file. (cherry picked from commit 867586be2918b2a77929ea3b65c60ffa0fe35c88) Change-Id: I0fa897b60c5eee02b5ad51c060d4d6bdd9b1f1cb
* | Merge "Update icu license."Narayan Kamath2014-07-101-1/+1
|\ \ | |/
| * Update icu license.Narayan Kamath2014-07-141-1/+1
|/ | | | | | (cherry picked from commit 1ad5803282c3c238eeb8dfef2db931bd3fcf2bd5) Change-Id: I6c9a3059fd39b3695f1d4737e977bda9e8411a4c
* Merge "TLS-PSK cipher suites should appear in API Level 21."Alex Klyubin2014-07-112-16/+16
|\
| * TLS-PSK cipher suites should appear in API Level 21.Alex Klyubin2014-07-082-16/+16
| | | | | | | | | | | | | | This also fixes a typo in two TLS-PSK cipher suite names. Bug: 15073623 Change-Id: I92d289c2b91862529faf6e06f2eb9b0a21d42b52
* | Merge "Add DexIndexOverflowException"Elliott Hughes2014-07-102-1/+31
|\ \
| * | Add DexIndexOverflowExceptionBenoit Lamarche2014-07-112-1/+31
|/ / | | | | | | | | | | (cherry-pick of 464c226afc28aa64c293bdc4eec3b8b348bc422a.) Change-Id: I51852fa88832db8b20ad65f091a0eb9e48fa3491
* | Merge "Invalidate cache of default SocketFactory"Kenny Root2014-07-105-0/+222
|\ \
| * | Invalidate cache of default SocketFactoryKenny Root2014-06-275-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the default SocketFactory is set once and never invalidated. Use the Services cache version number to know when to invalidate our cache. This increases the time to get the default implementation from 63ns to 97ns on a Nexus 7 (2013) aka deb. Change-Id: I5d46f02fccaa25e5bcea69d5ca0e4924290cf0e1
* | | Merge "KeyPairGeneratorTest: add back some DH tests"Kenny Root2014-07-101-6/+23
|\ \ \
| * | | KeyPairGeneratorTest: add back some DH testsKenny Root2014-07-101-6/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add back the DH tests that uses a pre-defined Diffie-Hellman prime and generator. Keep the tests that try to find safe prime disabled. Bug: 5513723 Bug: 16188130 Change-Id: If77b14287855528964665e7782be45c5f57434db
* | | Merge "Moved slow path flag to Reference class"Mathieu Chartier2014-07-102-0/+76
|\ \ \
| * | | Moved slow path flag to Reference classFred Shih2014-07-102-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added static field in Reference class to hold slow path flag and added benchmark to test Reference.get() performance. Change-Id: I13ad65a356fe4e104d8d83980694dc2740d7d039
* | | | 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
* | | | Merge "Switch libcore to the new icu."Elliott Hughes2014-07-091-2/+2
|\ \ \ \
| * | | | Switch libcore to the new icu.Elliott Hughes2014-07-091-2/+2
|/ / / / | | | | | | | | | | | | Change-Id: I58ec1fafdf5524538ac14c52d561bf93d5a6c946
* | | | Merge "Remove more."Elliott Hughes2014-07-085-102/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove more.Elliott Hughes2014-07-075-102/+3
|/ / / | | | | | | | | | | | | | | | (cherry-pick of f39b5ca3c6378c3c36c63889577004b9693ea9c6.) Change-Id: Idaf030cd369e728ec37df7107cd30062db899b7c
* | | Merge "Remove."Elliott Hughes2014-07-0740-5135/+264
|\ \ \
| * | | Remove.Elliott Hughes2014-07-0740-5135/+264
|/ / / | | | | | | | | | | | | | | | (cherry-pick of 63744c884dd4b4f4307f2b021fb894af164972af.) Change-Id: Ibf79a402e1bad98a262e380fcee3d35c127ae6d5
* | | Merge "Remove"Brian Carlstrom2014-07-068-379/+9
|\ \ \ | |/ / |/| |
| * | RemoveBrian Carlstrom2014-07-078-379/+9
|/ / | | | | | | | | | | (cherry picked from commit 36214feb86a0963b23f34c8c63584252bd757e19) Change-Id: I96d5109c01e39255b9970f7a515ddd3575a50e56
* | Merge "Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter.""Narayan Kamath2014-06-261-3/+3
|\ \
| * | Revert "Rename Arrays.ArrayList to Arrays.ArrayAdapter."Narayan Kamath2014-07-011-3/+3
| | | | | | | | | | | | | | | | | | This reverts commit 4b999a474eb92e0b89a34de56f3f7979fd491aa1. Change-Id: Ifd70798e74357ffe14cbc659ad49a9853b3be8c6
* | | Merge "Rename Arrays.ArrayList to Arrays.ArrayAdapter."Narayan Kamath2014-06-261-3/+3
|\ \ \ | |/ /
| * | 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
* | Merge "Fix System.arraycopy"Andreas Gampe2014-06-261-52/+0
|\ \ | |/ |/|
| * Fix System.arraycopyAndreas Gampe2014-06-261-52/+0
|/ | | | | | The generic version of arraycopy does not work. Remove it. Change-Id: I524289874cfbf62ed0af3c91264180041342c3f1
* Merge "Fix javadoc @char instead of @code."Elliott Hughes2014-06-261-1/+1
|\
| * Fix javadoc @char instead of @code.Elliott Hughes2014-06-261-1/+1
|/ | | | Change-Id: Icb2e2b075615fdf384c49da85145c2b5cb6f38c5
* 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
* | Merge "Clarify the String.compareTo contract and add tests."Elliott Hughes2014-06-262-304/+215
|\ \
| * | Clarify the String.compareTo contract and add tests.Elliott Hughes2014-06-262-304/+215
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | 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
* | | Merge "Expanded arraycopy function to deal with more types and updated ↵Jeff Hao2014-06-262-10/+495
|\ \ \ | |/ / | | | | | | benchmarking."
| * | Expanded arraycopy function to deal with more types and updated benchmarking.Emma Meersman2014-06-232-10/+495
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Don't return NULL as a jint."Ian Rogers2014-06-251-1/+1
|\ \ \
| * | | Don't return NULL as a jint.Ian Rogers2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Build fix. Change-Id: I49a566c3c34d2040e092689e52b0039c8195de03
* | | | Merge "Enable host multilib for ART testing."Ian Rogers2014-06-251-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Enable host multilib for ART testing.Ian Rogers2014-06-171-0/+1
| |/ / | | | | | | | | | Change-Id: I7827331202482e28e824fc6583f590ddadaa2087
* | | Merge "Fix race condition in WeakHashMapTest."Mathieu Chartier2014-06-231-6/+11
|\ \ \
| * | | Fix race condition in WeakHashMapTest.Mathieu Chartier2014-06-231-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I66350b6c87252e98bfbd945fe1f96bef58ec24a9
* | | | Merge "libcore: Clean up Enum.compareTo(E)"Narayan Kamath2014-06-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | libcore: Clean up Enum.compareTo(E)Valter Strods2014-06-241-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As E extends Enum<E>, it is safe to cast the comparable object to Enum<?> as it should not throw any exceptions. When it is cast, the ordinal value can be accessed directly. Doing so would be preferred as either both the variables this.ordinal and o.ordinal should be used or the methods this.ordinal() and o.ordinal() should be used without mixing them together. Change-Id: I7c4e93fdf35b0bf2949738a91c0855d9a52e5c13
* | | Merge "Build fix: Remove reference to deleted java_io_Console function"Neil Fuller2014-06-201-1/+0
|\ \ \
generated by cgit v1.1 at 2025-01-25 04:00:18 +0000