summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
| | * | | 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
* | | | | | am 60e4a65d: am 916c54b2: Merge "Enable host multilib for ART testing."Ian Rogers2014-06-251-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '60e4a65d7c30ea0b5456933db9a1aa75e4a3f645': Enable host multilib for ART testing.
| * | | | | am 916c54b2: Merge "Enable host multilib for ART testing."Ian Rogers2014-06-251-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '916c54b284be50cb4a84d1917981c90f78f949bb': Enable host multilib for ART testing.
| | * | | | 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
* | | | | am 47c61891: am 31e8ef04: Merge "Fix race condition in WeakHashMapTest."Mathieu Chartier2014-06-241-6/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '47c61891491acce74675622abf3132ff03464ae5': Fix race condition in WeakHashMapTest.
| * | | | am 31e8ef04: Merge "Fix race condition in WeakHashMapTest."Mathieu Chartier2014-06-241-6/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '31e8ef04eb3bc2029eb94393c3ce87245dd75da2': Fix race condition in WeakHashMapTest.
| | * | | 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
* | | | | | am cd80a830: am baff7d7f: Merge "libcore: Clean up Enum.compareTo(E)"Narayan Kamath2014-06-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cd80a8301b9f5b262d30e982e85820d4dc9685d4': libcore: Clean up Enum.compareTo(E)
| * | | | | am baff7d7f: Merge "libcore: Clean up Enum.compareTo(E)"Narayan Kamath2014-06-241-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'baff7d7fe8e90ef4ebf8f94776ba66604c76ffe1': libcore: Clean up Enum.compareTo(E)
| | * | | | 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 "@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
* | | | | | | am 3568b562: am c477bf9e: Merge "Unimplement Console.readPassword and remove ↵Neil Fuller2014-06-234-93/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | test" * commit '3568b5622585cdde1f15503784971653710fc2aa': Unimplement Console.readPassword and remove test
| * | | | | am c477bf9e: Merge "Unimplement Console.readPassword and remove test"Neil Fuller2014-06-234-93/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c477bf9eaf4553ed55b9d26c6bd65be3cc5665c6': Unimplement Console.readPassword and remove test
| | * | | | Merge "Unimplement Console.readPassword and remove test"Neil Fuller2014-06-204-93/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Unimplement Console.readPassword and remove testNeil Fuller2014-06-234-93/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConsoleTest.test_readPassword* fails CTS tests. Context: Under standard Android applications the System.console() method will return null. The Console.readPassword() method must turn off echo. Under automated tests the ConsoleTest is exercising a Console object with fake stdout / stdin streams to get around the absence of a System.console(). setEcho() is hardcoded to use stdin / stdout in the native code. Under the test runners stdin / stdout are not connected to a TTY leading to a ENOTTY. Under Android readPassword is unimportant. Rather than leaving untested security-related code the password methods are being unimplemented. It is unlikely this code has ever been used on Android given the absence of a System Console instance. Bug: 12491103 Change-Id: I755c014e6b53236f5bef0535be137dd721918b44
* | | | | | am 45eb0c24: am 017715a4: Merge "Assert that ↵Alex Klyubin2014-06-203-0/+60
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setEnabledProtocols/CipherSuites copy their inputs." * commit '45eb0c2447de656a657b3fa11ae2557e1289db4e': Assert that setEnabledProtocols/CipherSuites copy their inputs.
| * | | | | am 017715a4: Merge "Assert that setEnabledProtocols/CipherSuites copy their ↵Alex Klyubin2014-06-203-0/+60
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inputs." * commit '017715a4c4ebe853174bb6a9fc62089c4210c747': Assert that setEnabledProtocols/CipherSuites copy their inputs.
| | * | | | Merge "Assert that setEnabledProtocols/CipherSuites copy their inputs."Alex Klyubin2014-06-203-0/+60
| | |\ \ \ \
| | | * | | | Assert that setEnabledProtocols/CipherSuites copy their inputs.Alex Klyubin2014-06-193-0/+60
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSLSocket, SSLServerSocket, and SSLEngine offer setEnabledProtocols and setEnabledCipherSuites methods which take an array of protocols or cipher suites as input. If these methods store references to the input arrays, then the internal state (lists of enabled protocols and cipher suites) of SSLSocket, SSLServerSocket, and SSLEngine could be modified without going through the setter methods of these classes. Correct implementations of these methods should store copies of the input arrays. Bug: 15753142 Change-Id: Ia5248050d81320ed1da99892278bd60872605f52
* | | | | | am 33c1c8c3: am e0affcdc: Merge "Assert the updated list of supported ↵Alex Klyubin2014-06-191-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ECDHE-PSK cipher suites." * commit '33c1c8c36c62c1238876bddf916bdf92a5654543': Assert the updated list of supported ECDHE-PSK cipher suites.
| * | | | | am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher ↵Alex Klyubin2014-06-191-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suites." * commit 'e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d': Assert the updated list of supported ECDHE-PSK cipher suites.
| | * | | | Merge "Assert the updated list of supported ECDHE-PSK cipher suites."Alex Klyubin2014-06-181-2/+2
| | |\ \ \ \
| | | * | | | Assert the updated list of supported ECDHE-PSK cipher suites.Alex Klyubin2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15073623 Change-Id: I427c99f4c1c72690d95e5a3c63763631c41ddae2
* | | | | | | am 3019fd32: am c7531024: Merge "Fix for currency symbol coming from the ↵Neil Fuller2014-06-194-19/+52
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default locale" * commit '3019fd32394a00d61bc05ce4e7cb3c949f6143ee': Fix for currency symbol coming from the default locale
| * | | | | | am c7531024: Merge "Fix for currency symbol coming from the default locale"Neil Fuller2014-06-194-19/+52
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c7531024059932aab5f03c4dd6f3d8b5491ed226': Fix for currency symbol coming from the default locale
| | * | | | | Merge "Fix for currency symbol coming from the default locale"Neil Fuller2014-06-174-19/+52
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix for currency symbol coming from the default localeNeil Fuller2014-06-194-19/+52
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NumberFormat.setCurrency() (actually DecimalFormat) was using currency.getSymbol() without passing the format's locale. This caused the default Locale to be used to look up the symbol. The fix uses the format locale, not the default. A test has been added to demonstrate the problem / fix. To avoid having the NativeDecimalFormat know about the locale class, the symbol is passed as an argument rather than the Currency object. This is an internal API. Making this change showed an issue with Currency.getSymbol(): For Locales without a country the currency code would be returned and not a symbol. ICU provides language-level symbols so this was not the best we could do. Since the code was previously using the default Locale, and the default locale usually has a country it was not previously obvious. testBug71369 broke because of this second issue. The code is also fixed here. This was discovered while investigating bug 71369 but is not related. Change-Id: If0ce280aefb042fe8f7ca126cced090b9268a866
* | | | | | am 8c83d2aa: am 2eb56b69: Merge "Fix CurrencyTest.test_getSymbol for unknown ↵Neil Fuller2014-06-193-41/+60
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variants" * commit '8c83d2aa1fd7b7e3f9ca7415f9dfdf94de1314ec': Fix CurrencyTest.test_getSymbol for unknown variants
| * | | | | am 2eb56b69: Merge "Fix CurrencyTest.test_getSymbol for unknown variants"Neil Fuller2014-06-193-41/+60
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2eb56b69de339978a29d94531759b465742f027f': Fix CurrencyTest.test_getSymbol for unknown variants
| | * | | | Merge "Fix CurrencyTest.test_getSymbol for unknown variants"Neil Fuller2014-06-173-41/+60
| | |\ \ \ \
| | | * | | | Fix CurrencyTest.test_getSymbol for unknown variantsNeil Fuller2014-06-183-41/+60
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior of CurrencyTest.getSymbol has changed since K for unrecoginzed locales. Commit de0eb683370d789e7bb25673b350b8dbf2ba5d69 now means the ICU default locale is set when the Java default locale is changed. Previously it would have been left unset and would have fallen back to using the system settings (most likely US or UK English during tests). The test is setting the Java default locale to "kr-KR" (a locale unrecognized by ICU) and requesting the currency symbol for USD for locale "kr-KR" (still unrecognized by ICU). Before the commit: Because the kr-KR argument is unrecognized ICU tries the ICU default (which was unset and so picked system setting of en). It returned "$". After the commit: As above, but now the ICU default is set to kr-KR. Since there is no entry for USD in the default it falls back to "root", and returns the value found there: "US$". Behavior when the default locale is unrecognized is edge-case and arguably it is no more / less correct before or after this commit. The test has been updated to reflect the new value + some tidy up of the test generally. This change also contains a more focused test that demonstrates the behavior in ICU and adds documentation to make ICU slightly clearer. Arguably neither the new ICUTest nor the existing CurrencyTest code should exist because they assert edge-case behavior that Android may wish to change in future. Bug: 14821275 Change-Id: I8beb6004b0c37d2fe59855d13d2c8e2e6fe1c530
* | | | | | am bfbc1b51: am 0be12357: Merge "Removing tests that test the SqlLite API ↵Neil Fuller2014-06-1914-3226/+145
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly." * commit 'bfbc1b512b2c31907dd9a90dace17a4346912d03': Removing tests that test the SqlLite API directly.
| * | | | | am 0be12357: Merge "Removing tests that test the SqlLite API directly."Neil Fuller2014-06-1914-3226/+145
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '0be123572d8d243ca6018ce8b61b0476e629e37d': Removing tests that test the SqlLite API directly.
| | * | | | Merge "Removing tests that test the SqlLite API directly."Neil Fuller2014-06-1714-3226/+145
| | |\ \ \ \
| | | * | | | Removing tests that test the SqlLite API directly.Neil Fuller2014-06-1714-3226/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the tests were testing that the SqlLite Java API works. Android does not ship with the SQLLite code as a public API so these have been removed. Some of the tests were testing JDBC APIs associated with Connection, Driver and DriverManager behavior so these have been retained and moved to libcore/java/sql/DriverTest.java / ConnectionTest.java Change-Id: I97ec05591019505f527ee134177c5637bbd08538
* | | | | | | am b8586cf5: am 9aad5527: Merge "CTS fix: Signature2Test.test_clone()"Neil Fuller2014-06-192-1/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b8586cf5e48f81987b11d3b206f9a9f6f0ae6dbf': CTS fix: Signature2Test.test_clone()
| * | | | | | am 9aad5527: Merge "CTS fix: Signature2Test.test_clone()"Neil Fuller2014-06-192-1/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9aad55279f870ac0dec65f0fe87af6e2fe79bf1b': CTS fix: Signature2Test.test_clone()
| | * | | | | Merge "CTS fix: Signature2Test.test_clone()"Neil Fuller2014-06-172-1/+11
| | |\ \ \ \ \
| | | * | | | | CTS fix: Signature2Test.test_clone()Neil Fuller2014-06-182-1/+11
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would throw a NullPointerException. Fixing that rendered the Signature cloneable and the test assertions failing. The test now passes but is of questionable value except to prove the absence of RuntimeException. Change-Id: I2a5b160f0914837b37b801e16b8a3717d00fd94e