summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am bba4d1ca: Merge "Remove libdvm VMRuntime.vmFlags"Brian Carlstrom2014-05-231-7/+0
|\ | | | | | | | | * commit 'bba4d1ca4b7099f52cd598d14e33c4d2211f2ccb': Remove libdvm VMRuntime.vmFlags
| * Merge "Remove libdvm VMRuntime.vmFlags"Brian Carlstrom2014-05-231-7/+0
| |\
| | * Remove libdvm VMRuntime.vmFlagsBrian Carlstrom2014-05-221-7/+0
| |/ | | | | | | Change-Id: I9305e3d350997a82f1caf2b2f0f30521920b2f62
* | am b7c97ec6: Merge "Provide more information about the runtime"Sebastien Hertz2014-05-222-0/+41
|\ \ | |/ | | | | | | * commit 'b7c97ec6be8fa92c5593b1ab49b4a952a741c9fd': Provide more information about the runtime
| * Merge "Provide more information about the runtime"Sebastien Hertz2014-05-222-0/+41
| |\
| | * Provide more information about the runtimeSebastien Hertz2014-05-222-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds methods vmInstructionSet, is64Bit and isCheckJniEnabled to the VMRuntime class. They are used by DdmHandleHello class in the framework to report new information about the runtime to DDMS. Bug: 14888999 Bug: 14888124 Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
* | | am ce478bec: Merge "DigestTest: reduce flakiness by having more iterations"Kenny Root2014-05-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'ce478bec95ecb87fcdc25cfaaf917f13180f4660': DigestTest: reduce flakiness by having more iterations
| * | Merge "DigestTest: reduce flakiness by having more iterations"Kenny Root2014-05-211-1/+1
| |\ \
| | * | DigestTest: reduce flakiness by having more iterationsKenny Root2014-05-211-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | This fails every once in a while sinch this isn't a rigorous benchmark, but try to combat it by having more iterations so the measurement has more time to stabilize. Change-Id: I4336d0d670e1e666e5bb75788228651f563eb59a
* | | am 32466548: Merge "Suppress OldResultSetTest#testAfterLast"Neil Fuller2014-05-211-1/+4
|\ \ \ | |/ / | | | | | | | | | * commit '324665480d3bf34b724d9a25a589a89379394139': Suppress OldResultSetTest#testAfterLast
| * | Merge "Suppress OldResultSetTest#testAfterLast"Neil Fuller2014-05-211-1/+4
| |\ \
| | * | Suppress OldResultSetTest#testAfterLastNeil Fuller2014-05-211-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | It was re-enabled by If829a83cfcf82cac9a0301733b724716087fea05 but does appear to fail still. Change-Id: If4c4c595856de111be228baaabe0598d102330c3
* | | am a2138c1f: Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'a2138c1f0dc6f319062d4d09f6e0223f83340709': Fix typo in test
| * | Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
| |\ \
| | * | Fix typo in testNeil Fuller2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is supposed to be testing afterLast() not beforeFirst(). Change-Id: Ie36c55ec4d5a09e85ba6a6c5e2eeb037f34422ce
* | | | am 321dec9c: Merge "Keep Preferences tests working"Neil Fuller2014-05-214-3/+76
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '321dec9ceb27ebf4effa8db47e02fe25c38aebe8': Keep Preferences tests working
| * | | Merge "Keep Preferences tests working"Neil Fuller2014-05-214-3/+76
| |\ \ \ | | |/ / | |/| |
| | * | Keep Preferences tests workingNeil Fuller2014-05-214-3/+76
| |/ / | | | | | | | | | | | | | | | | | | | | | Apply changes made as part of I6019441c65b398376d84264f1e4c9776507533eb more widely. Bug: 15105787 Change-Id: I2e44487b1561dd564bfa41d65995a61091b011eb
* | | am 49c2fa00: Merge "Deprecate use of BrokenTest and SideEffect"Neil Fuller2014-05-2120-46/+93
|\ \ \ | |/ / | | | | | | | | | * commit '49c2fa00ff36308903f8021c56e608325f8c21ee': Deprecate use of BrokenTest and SideEffect
| * | Merge "Deprecate use of BrokenTest and SideEffect"Neil Fuller2014-05-2120-46/+93
| |\ \
| | * | Deprecate use of BrokenTest and SideEffectBrett Chabot2014-05-2120-46/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use expectations files instead. (cherry picked from commit 6a6b612286976cc185c898803fe51e4e062bd9eb) Bug: 12924356 Change-Id: I9b7e71805a80176c873cffe46bed65f81de1903d
* | | | am 8e34bfb3: Merge "Ensure NET_FAILURE_RETRY return -1 in case of an error"Neil Fuller2014-05-211-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8e34bfb3d94388670de3d2be5bc575508d309e86': Ensure NET_FAILURE_RETRY return -1 in case of an error
| * | | Merge "Ensure NET_FAILURE_RETRY return -1 in case of an error"Neil Fuller2014-05-211-0/+2
| |\ \ \
| | * | | Ensure NET_FAILURE_RETRY return -1 in case of an errorSerguei Katkov2014-05-201-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to contract NET_FAILURE_RETRY / IO_FAILURE_RETRY should return -1 and set pending exception in case of an error. Not setting -1 was leading callers to assume a success. Change-Id: I995fa97f8ee8993a379f21582a14567818ea64bd Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
* | | | am 96817bc3: Merge "Signature: remove unnecessary throw on clone"Kenny Root2014-05-202-17/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '96817bc38a0fb644b95dfb73a6fb5c273708b8f3': Signature: remove unnecessary throw on clone
| * | | Merge "Signature: remove unnecessary throw on clone"Kenny Root2014-05-202-17/+3
| |\ \ \
| | * | | Signature: remove unnecessary throw on cloneKenny Root2014-05-202-17/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a class couldn't be cloned, it would throw its own exception. Instead, rely on the default implementation of "clone" to give a better error message when the target class isn't cloneable. Change-Id: I2cae9cdad9b4a7cf7fe50f7ad37fd22c1a97c825
* | | | am f7a15ff4: Merge "MessageDigest: remove unnecessary throw on clone"Kenny Root2014-05-201-14/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f7a15ff43004414e1eaa35872e9307383bdf84e4': MessageDigest: remove unnecessary throw on clone
| * | | Merge "MessageDigest: remove unnecessary throw on clone"Kenny Root2014-05-201-14/+2
| |\ \ \
| | * | | MessageDigest: remove unnecessary throw on cloneKenny Root2014-05-201-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a class couldn't be cloned, it would throw its own exception. Instead, rely on the default implementation of "clone" to give a better error message when the target class isn't cloneable. Change-Id: Id37013515d49cb69b5683a0632cfddb0fb325dc0
* | | | | am a1ece7ec: Merge "Add regression tests for null arguments to DecimalFormat."Elliott Hughes2014-05-201-0/+63
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a1ece7ecd8d1803dc568807ed677079716d6556d': Add regression tests for null arguments to DecimalFormat.
| * | | | Merge "Add regression tests for null arguments to DecimalFormat."Elliott Hughes2014-05-201-0/+63
| |\ \ \ \
| | * | | | Add regression tests for null arguments to DecimalFormat.Elliott Hughes2014-05-201-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was already fixed last year by 3909f6dba0812caee25a8779dcbf4c50ce9b19c7 under a different bug, but this extends the testing to all methods that could take a null argument. Bug: https://code.google.com/p/android/issues/detail?id=62269 Bug: 15081434 Change-Id: I30c97360a868e412649850109e24f2707c072a30
* | | | | | am f315df1c: Merge "Fix OldURLClassLoaderTest#test_findResource_String"Neil Fuller2014-05-201-26/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f315df1cb0768bec10ada80d30d7069d15ac76ba': Fix OldURLClassLoaderTest#test_findResource_String
| * | | | | Merge "Fix OldURLClassLoaderTest#test_findResource_String"Neil Fuller2014-05-201-26/+10
| |\ \ \ \ \
| | * | | | | Fix OldURLClassLoaderTest#test_findResource_StringNeil Fuller2014-05-201-26/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test broke because Support_TestWebData was changed to provide the /test3 URL for a different test (Ib43e68a2536c2602b4c7ee0cda68fa1f90045f57). Changing the URL to test9999 fixes it. The OldURLClassLoaderTest is unpleasant but I haven't touched it beyond correcting the test and fixing some of the more obvious style / import problems that my IDE pointed out. Change-Id: I42b3e8ab69cdef65ee381efbf1988cfdfa359868
* | | | | | am 34ea9861: Merge "Fix test_isWhitespace_against_icu4c"Neil Fuller2014-05-201-2/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '34ea986122cf6641d4d93500830524302621d15a': Fix test_isWhitespace_against_icu4c
| * | | | | Merge "Fix test_isWhitespace_against_icu4c"Neil Fuller2014-05-201-2/+16
| |\ \ \ \ \
| | * | | | | Fix test_isWhitespace_against_icu4cNeil Fuller2014-05-201-2/+16
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICU4C and the RI disagree about one character. Add the special case to the test so it can pass. Also fix isSpaceChar_against_icu4c so it asserts something, and add the special case there too. Bug: 9690863 Change-Id: I389690e5c598b9e2f04015b0bc14799b163a6adf
* | | | | | am 0e78f064: Merge "Fix InetAddressTest"Neil Fuller2014-05-201-3/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0e78f0642104c599abb9fd4fb24092a6afb25510': Fix InetAddressTest
| * | | | | Merge "Fix InetAddressTest"Neil Fuller2014-05-201-3/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix InetAddressTestNeil Fuller2014-05-191-3/+12
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: test_getByName test_isNumeric test_parseNumericAddress Change Ic42173b7b06e8536e8c4331087720d7df1e1681a (made in early 2011) modified handling of "obsolete" numeric IP addresses. At least since then, Octal addresses (those with leading 0's) have been parsed as decimal values. The tests were written to expect Octal values to be rejected and 0177.00.00.01 was expected to be treated as an invalid address. If interpreted as a decimal (177.0.0.1) it is fine. The tests have been updated to test a more obviously incorrect value and the docs have been updated to document how Android and the RI differ. Bug: 4539262 Change-Id: I5f9dce6b1accd81dda1348718fe0c74b03c27c29
* | | | | am 6b9a7d3e: Merge "DirectByteBuffer: allow 0-size MappedByteBuffers ↵Lajos Molnar2014-05-192-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | starting at NULL" * commit '6b9a7d3e754ab5588aee4ae54579cf6838bb7e0c': DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULL
| * | | | Merge "DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULL"Lajos Molnar2014-05-192-2/+5
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | DirectByteBuffer: allow 0-size MappedByteBuffers starting at NULLLajos Molnar2014-05-162-2/+5
| | | |/ | | |/| | | | | | | | | | | | | Bug: 14297827 Change-Id: I53ae796f9a59c70cc8250477ab51c57ea728e43b
* | | | am 2de26a11: Merge "Fix the expected failure when an array of void is ↵Ian Rogers2014-05-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | attempted to be created." * commit '2de26a11390c644f5afda07f2a30a278e3a3543c': Fix the expected failure when an array of void is attempted to be created.
| * | | Merge "Fix the expected failure when an array of void is attempted to be ↵Ian Rogers2014-05-191-2/+2
| |\ \ \ | | |_|/ | |/| | | | | | created."
| | * | Fix the expected failure when an array of void is attempted to be created.Ian Rogers2014-05-181-2/+2
| | |/ | | | | | | | | | | | | | | | NoClassDefFoundError is the RI behavior. Change-Id: Ia03b585def9f772aeb17f1cdec4da2d0c807ede3
* | | am 6167671b: Merge "Reenable tests that currently pass in CTS"Neil Fuller2014-05-192-91/+0
|\ \ \ | |/ / | | | | | | | | | * commit '6167671bf318661c6d9f9f44d4ad4b14d60e9224': Reenable tests that currently pass in CTS
| * | Merge "Reenable tests that currently pass in CTS"Neil Fuller2014-05-192-91/+0
| |\ \ | | |/ | |/|
generated by cgit v1.1 at 2025-04-01 19:51:46 +0000