summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix the Turkish Lira test."Elliott Hughes2014-08-231-5/+7
|\
| * Fix the Turkish Lira test.Elliott Hughes2014-08-221-5/+7
|/ | | | | | | | | | Turkey switched from "123,45 TL" to "₺123,45" in 2012. It's taken a while for our font to catch up, but now it has. (cherry-pick of c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.) Bug: 16727554 Change-Id: I3c80f95d5f620c905247c9f227171717180106b4
* Merge "Work around the snappily-titled ICANN "Name Collision Occurrence ↵Elliott Hughes2014-08-232-4/+4
|\ | | | | | | Management Framework"."
| * Work around the snappily-titled ICANN "Name Collision Occurrence Management ↵Elliott Hughes2014-08-222-4/+4
|/ | | | | | | | | | | Framework". Using a non-existent TLD is now a Bad Idea. (cherry-pick of a7d651e95e38974fa0de19247e8341df98a0b1b1.) Bug: 17146413 Change-Id: I6a68b4609d59a6d56ba780d03ffcf24a2759db48
* Merge "Avoid wrapping Class in WeakReference when class loader is null."Ian Rogers2014-08-221-7/+1
|\
| * Avoid wrapping Class in WeakReference when class loader is null.Ian Rogers2014-08-221-7/+1
| | | | | | | | | | | | Fix a missing case from one constructor by delegating to another. Change-Id: I8b85c97586dde2d72c9ac21216c594aa810d761b
* | Merge "Support narrow am/pm markers in LocaleData."Elliott Hughes2014-08-223-2/+44
|\ \
| * | Support narrow am/pm markers in LocaleData.Elliott Hughes2014-08-223-2/+44
|/ / | | | | | | | | | | | | (cherry-pick of ebe417d7808ac5bce5bc14d36d6af4c31218326d.) Bug: 16938600 Change-Id: I7334c1ea57ea0593b3e0bd7943f8a5208c704881
* | Merge "Move preference tests over from external/apache-harmony."Narayan Kamath2014-08-2217-0/+3228
|\ \ | |/ |/|
| * Move preference tests over from external/apache-harmony.Narayan Kamath2014-08-2217-0/+3228
|/ | | | | | | | | | | | | | Also fixes all remaining failures. Most of them were due to us not setting "user.dir" and "user.home" correctly. Android has traditionally left those values blank. To fix these tests, we need to change the default prefs factory to one rooted at a temporary directory. Note that this change attempts the minimal possible cleanup (mainly style, commented code formatting etc.) to these files. bug: 13881847 Change-Id: I1918ee9af07be9612a7da142b3e584aabc860085
* Merge "Fix abuse of Runtime.freeMemory."Narayan Kamath2014-08-221-41/+37
|\
| * Fix abuse of Runtime.freeMemory.Narayan Kamath2014-08-211-41/+37
|/ | | | | | | | | | Runtime.freeMemory is the largest allocation that's possible *without a heap expansion*. That's a poor proxy for "can i allocate this byte array" and leads to flaky CTS tests. bug: 17021619 Change-Id: I108138bf2402e899a40a0b3081c083f733e7c999
* Merge "Fix init test cases from DexClassLoaderTest."Calin Juravle2014-08-211-32/+52
|\
| * Fix init test cases from DexClassLoaderTest.Calin Juravle2014-08-211-32/+52
|/ | | | | | | | | | | | | Because the tests cases are executed in the same runtime and the class linker may cache generated optimized files, init tests need to use their own optimized directories (so that they can reliable test the number of generated files). Bug: 16806146 (cherry picked from commit 58c130c1eb99cc72998150d813b3e31896e3bfaf) Change-Id: I8111cc7ea640f3bc94821fcd4380acfc078c746f
* Merge "bionic has always had gettid."Elliott Hughes2014-08-161-1/+2
|\
| * bionic has always had gettid.Elliott Hughes2014-08-201-1/+2
|/ | | | | Bug: 17049821 Change-Id: I309ecfad7e38cf664518a92d6812ffbd90060b79
* Merge "Update ziparchive usage to the new API."Piotr Jastrzebski2014-08-161-2/+3
|\
| * Update ziparchive usage to the new API.Piotr Jastrzebski2014-08-151-2/+3
| | | | | | | | | | Bug: 16162465 Change-Id: Iea4d39e1bb74be7ad9041aa3dbb5809d53f63faf
* | Merge "Avoid triggering StrictMode when closing a socket."Elliott Hughes2014-08-151-2/+5
|\ \
| * | Avoid triggering StrictMode when closing a socket.Elliott Hughes2014-08-151-2/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, we called getsockoptLinger unconditionally, using ENOTSOCK to recognize the non-socket case, but the cost of throwing an exception is so high (both on dalvik and art) that we worked around that by doing an fstat first. This was mostly fine, but fstat calls onReadFromDisk, which isn't true for the socket case (which causes upset for threads that are allowed to touch the network but not allowed to touch disk, which Chrome uses, even though it's not immediately obvious to me why that makes any sense). (cherry-pick of d636777d624428dfc51d1181f47602f389eb4cce.) Bug: 4972558 Bug: 12133112 Change-Id: Ic0b89d1f181e436b4f43c1c04c1f706883ab84c0
* | Merge "Fix parsing of fractional seconds."Narayan Kamath2014-08-152-2/+37
|\ \ | |/ |/|
| * Fix parsing of fractional seconds.Narayan Kamath2014-08-142-2/+37
|/ | | | | | | | | | | | | We were just parsing them as millisecond values, which is wrong. ".1" fractional second is 100 milliseconds (we were parsing it as 1 ms), and ".765432" fractional seconds is 765 milliseconds (we were parsing it as 765432ms. In most cases, this was hidden by the fact that we were formatting such values incorrectly as well. bug: 16969112 Change-Id: Id287684f78691090ac4a6c3029d7909f2c1e1310
* Merge "Allow Calendar.getInstance to be called with a null Locale."Narayan Kamath2014-08-139-0/+105
|\
| * Allow Calendar.getInstance to be called with a null Locale.Narayan Kamath2014-08-139-0/+105
|/ | | | | | | | | | | | | LocaleData.get was changed to throw for null locales instead of falling back to the default, so we need to adjust callers accordingly. Turns out all other callers would've thrown anyway (for different reasons) so this change makes those exceptions explicit and adds tests for them. bug: 16938922 Change-Id: I3e77435a6b414b002b96a4f8deb44b51591c5a51
* Merge "Make parameter name match comments for sdk build."Jeff Hao2014-08-111-1/+1
|\
| * Make parameter name match comments for sdk build.Jeff Hao2014-08-111-1/+1
|/ | | | Change-Id: I4dba2cfe07cf0c5ce28a0ff4540aa68d9c664a2a
* Merge "Implements some StrictMath functions for improved performance."Jeff Hao2014-08-112-38/+476
|\
| * Implements some StrictMath functions for improved performance.Emma Meersman2014-08-112-38/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions ceil, floor, hypot, IEEEremainder, nextafter, and rint have all been implemented in Java to save the native call. Benchmarking numbers to show this performance improvement are included: Native call (before change): benchmark=Ceil: 97.40 ns; σ=0.02 ns @ 3 trials benchmark=Floor: 98.73 ns; σ=0.02 ns @ 3 trials benchmark=Hypot: 714.62 ns; σ=0.44 ns @ 3 trials benchmark=IEEEremainder: 180.31 ns; σ=0.08 ns @ 3 trials benchmark=NextAfterD: 110.47 ns; σ=0.02 ns @ 3 trials benchmark=NextAfterF: 96.20 ns; σ=0.01 ns @ 3 trials benchmark=Rint: 92.21 ns; σ=0.02 ns @ 3 trials Java implementation (after change): benchmark=Ceil: 47.32 ns; σ=0.01 ns @ 3 trials benchmark=Floor: 42.03 ns; σ=0.00 ns @ 3 trials benchmark=Hypot: 69.42 ns; σ=0.37 ns @ 3 trials benchmark=IEEEremainder: 49.64 ns; σ=0.04 ns @ 3 trials benchmark=NextAfterD: 63.32 ns; σ=0.17 ns @ 3 trials benchmark=NextAfterF: 64.67 ns; σ=0.12 ns @ 3 trials benchmark=Rint: 31.10 ns; σ=0.41 ns @ 10 trials Change-Id: I9ee926514c0661cdb7a1e6ae3acfe5c31a4b9f20
* | Merge "Don't allow Class.class.getDeclaredConstructor().setAccessible()."Mathieu Chartier2014-08-111-0/+7
|\ \
| * | Don't allow Class.class.getDeclaredConstructor().setAccessible().Mathieu Chartier2014-08-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The new behavior is to throw a SecurityException. Bug: 16866726 Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=561 Change-Id: I1fa0d9617f8b25bf4e93a52c4aed22f0be27555b
* | | Merge "Fix TimeZone.getAvailableIDs(int)."Elliott Hughes2014-08-112-13/+45
|\ \ \ | |_|/ |/| |
| * | Fix TimeZone.getAvailableIDs(int).Elliott Hughes2014-08-112-13/+45
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This was broken by the removal of the pre-computed raw offsets from the tzdata file. I think that's still the direction we want to go (with us hopefully using more of icu4j at some point, and eventually relying solely on the icu time zone data), so this patch adds code to lazily evaluate all the offsets by instantiating all the time zones. (cherry-pick of 065d7764ac1dfe74ee94d17ca6c810de37b57d3e.) Bug: 16947622 Change-Id: I6d1dfe5ee6c99338f9807c3af5b6f04539c256c3
* | Merge "Stop keeping iteration prefix around."Piotr Jastrzebski2014-08-071-10/+4
|\ \
| * | Stop keeping iteration prefix around.Piotr Jastrzebski2014-08-111-10/+4
| | | | | | | | | | | | | | | | | | zip archive makes a copy of a prefix and maintains it's lifecycle now. Change-Id: I55adc4c9eefee96b80038fb7dbb95dbe498d5a73
* | | Merge "Remove memory leak."Piotr Jastrzebski2014-08-071-0/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Remove memory leak.Piotr Jastrzebski2014-08-111-0/+1
|/ | | | | | | Call EndIteration in IterationHandle destructor. This will free the memory allocated for cookie in StartIteration. Change-Id: I12c861c7da2437113c669a0c7f41b5585ed94c72
* Merge "Implements some math functions for faster performance"Jeff Hao2014-08-083-129/+1017
|\
| * Implements some math functions for faster performanceMichael Chen2014-07-243-129/+1017
| | | | | | | | | | | | | | | | | | Changes cosh, exp, expm1, log, log10, sinh, cbrt, asin, acos, atan, tanh, log1p These functions are now implemnted in java to save the overhead of a jni call Change-Id: I4d3b70dd1693378af5b04cbbe0fecd95d97c1cff
* | Merge "Variants are case sensitive."Narayan Kamath2014-08-072-6/+13
|\ \
| * | Variants are case sensitive.Narayan Kamath2014-08-082-6/+13
|/ / | | | | | | | | | | | | Yet we were incorrectly upper-casing them inside forLanguageTag. bug: 16811867 Change-Id: I088161c4c7769908f35b9f2b7d945fb1cd1fd7ac
* | Merge "Remove nameLength field from ZipEntry."Piotr Jastrzebski2014-08-072-11/+6
|\ \
| * | Remove nameLength field from ZipEntry.Piotr Jastrzebski2014-08-082-11/+6
|/ / | | | | | | | | | | | | It seems that this field is never used outside the internal constructor so it can be a local variable instead. Change-Id: I2aa26fb3fd13c571224a9aee14c7eea93e5c9591
* | Merge "Revert "Remove nameLength field from ZipEntry.""Narayan Kamath2014-08-072-5/+10
|\ \
| * | Revert "Remove nameLength field from ZipEntry."Narayan Kamath2014-08-072-5/+10
| | | | | | | | | | | | | | | | | | This reverts commit c4da34ca5792e0c73577f868249fdfe8a11a01f6. Change-Id: I1b93ecfcb8a867a670af717eb25c7076b7097d5c
* | | Merge "Track bouncycastle upgrade to 1.51"Kenny Root2014-08-071-2/+2
|\ \ \
| * | | Track bouncycastle upgrade to 1.51Kenny Root2014-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The SubjectKeyIdentifierStructure class is no longer in Bouncycastle. Change-Id: Ie5eb91a14ec38f773ef22754d77651a161fd7122
* | | | Merge "Remove nameLength field from ZipEntry."Piotr Jastrzebski2014-08-062-10/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Remove nameLength field from ZipEntry.Piotr Jastrzebski2014-08-072-10/+5
|/ / / | | | | | | | | | | | | | | | | | | It seems that this field is never used outside the internal constructor so it can be a local variable instead. Change-Id: Icd9e009a24ae22da8f5dfd18b9f0ab80913129d4
* | | Merge "Implement equals and hashCode in ParameterizedTypeImpl"Piotr Jastrzebski2014-08-052-4/+40
|\ \ \
| * | | Implement equals and hashCode in ParameterizedTypeImplPiotr Jastrzebski2014-08-072-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and GenericArrayTypeImpl. Bug: 14590652 Bug: https://code.google.com/p/android/issues/detail?id=74060 Change-Id: Ib9a30b741a8d5f82d21f37ca8959bf5b2893f8db