summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add android.system.Os.link for link(2)."Elliott Hughes2014-05-106-0/+26
|\
| * Add android.system.Os.link for link(2).Elliott Hughes2014-05-096-0/+26
| | | | | | | | | | Bug: 14683762 Change-Id: Ieeba1d2d0c5e9c05e85c6ffbaeb5a7febc69238c
* | Merge "Fix various errors in FileURLConnectionTest."Narayan Kamath2014-05-093-40/+186
|\ \
| * | Fix various errors in FileURLConnectionTest.Narayan Kamath2014-05-093-40/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - First, the test was broken pretty badly. It would pass a Jar style URL to a FileURLConnection and expect it to work, this is out of spec and seems wrong in general (file:///foo.apk!resources/foo.txt). - The RI supports various "headers" on file URL connections (sigh). As if the getHeaderField(int) and getHeaderFieldKey(int) APIs weren't bad enough. This has now been implemented with a naive implementation. - Fixes FileURLConnection to populate a header map for information it provides (content length, content type etc.) bug: 11664881 Change-Id: I7a3e9aaa79bf125abbcfe8367574115ce54718e3
* | | Merge "Add missing 'const'."Elliott Hughes2014-05-091-1/+1
|\ \ \
| * | | Add missing 'const'.Elliott Hughes2014-05-081-1/+1
| | |/ | |/| | | | | | | Change-Id: I20311836b80bc655a5ae389ef2f49b2a09f79744
* | | Merge "SSLSocketTest: fix some flaky tests"Kenny Root2014-05-081-1/+3
|\ \ \
| * | | SSLSocketTest: fix some flaky testsKenny Root2014-05-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing the server socket before SSL_do_handshake completed would sometimes make SSL_do_handshake exit before it read the client's SSL alert message. Change-Id: I68bfb3d1908b055722678b7280ec4afe37a03ec8
* | | | Merge "Add CRLReason and friends"Kenny Root2014-05-089-3/+477
|\ \ \ \
| * | | | Add CRLReason and friendsKenny Root2014-05-089-3/+477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New API for getting the revocation reason. Add tests and exceptions associated with it. Change-Id: Ifd6444ab966c984312f069a6ee330d255110ea85
* | | | | Merge "Handle Reference.get in native code."Mathieu Chartier2014-05-082-0/+198
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Handle Reference.get in native code.Mathieu Chartier2014-05-062-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to have mostly concurrent reference processing in the GC. Reference.get() may block if references are being processed. Bug: 14381653 Change-Id: I7cf6ef34b08f804897c8e6d5e9e6ae94420dc489
* | | | | Merge "Use the right class loader in ProxyTest."Narayan Kamath2014-05-081-6/+6
|\ \ \ \ \
| * | | | | Use the right class loader in ProxyTest.Narayan Kamath2014-05-081-6/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the test classloader, and not the system classloader. bug: 12490858 Change-Id: I108ce6e810e861f2297fa5be5d16578cc8083e81
* | | | | Merge "Blacklist ControlTest test case."Neil Fuller2014-05-081-0/+8
|\ \ \ \ \
| * | | | | Blacklist ControlTest test case.Neil Fuller2014-05-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | org.apache.harmony.tests.java.util.ControlTest The test is probably broken, but the code under test also looks broken. Unpicking it all and fixing it all is low priority. Marking it as known-broken until it can be given the attention it deserves. Change-Id: I0e2784aa505ace4ab86149741c2faf94d8432df9 Bug: 13747957
* | | | | | Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types
| * | | | | | KeyStoreTest: add more key typesKenny Root2014-05-071-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test all the possible key types in the KeyStoreTest. Change-Id: Iaaafcbededfb8960dcfdeaea20b8b631a4a36bf8
| * | | | | | KeyManagerFactoryTest: add all the possible key typesKenny Root2014-05-072-6/+19
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds all the possible key types from the Standard Names document to the tests. Change-Id: Ifbca56371261c040c3cb9e0d80447e9cb73cad0f
* | | | | | Merge "NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5"Kenny Root2014-05-081-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5Kenny Root2014-05-071-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fails on the RI and Android now. Add it to the known failures since we don't deal with CRLs anyway. Bug: 12905370 Change-Id: Id21af237aaa2709d71ffd3268a730fc4cf102d92
* | | | | Merge "Ensure consistent (backwards-compatible) capitalization for ↵Elliott Hughes2014-05-082-126/+133
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | yesterday/today/tomorrow."
| * | | | | Ensure consistent (backwards-compatible) capitalization for ↵Elliott Hughes2014-05-072-126/+133
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yesterday/today/tomorrow. Bug: 14493853 Change-Id: I971ffc2d47534aef67df951725fcd16802ea6d54
* | | | | Merge "Basic documentation for android.system."Elliott Hughes2014-05-0710-36/+511
|\ \ \ \ \
| * | | | | Basic documentation for android.system.Elliott Hughes2014-05-0710-36/+511
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also individually @hide the methods we might not want to expose straight away. These are basically the ones where the mapping to Java types isn't completely straightforward, usually resulting in a family of similar methods. Change-Id: I7b3d555c4599dc8c64e23f5c494a358ef68c6777
* | | | | Merge "Change ReferenceQueue order from LIFO to FIFO."Narayan Kamath2014-05-071-9/+12
|\ \ \ \ \
| * | | | | Change ReferenceQueue order from LIFO to FIFO.Elena Sayapina2014-05-061-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LIFO order of FinalizerReference.queue breaks runFinalization(). runFinalization() creates a Sentinel finalizable object and waits for it to be finalized. As FinalizerReference.queue is LIFO, the Sentinel object is placed at the beginning of the queue and then gets finalized first. So the method returns even though objects placed in the queue before the Sentinel are not finalized. This patch changes the queue order to FIFO to ensure that all elements enqueued before the Sentinel are finalized before it. bug: https://code.google.com/p/android/issues/detail?id=37980 Change-Id: Ie6bc96e6a3759bc36ce6586066052b6d6bbe8d52 Signed-off-by: Elena Sayapina <elena.v.sayapina@intel.com>
* | | | | | Merge "Add java.security.cert.Extension interface"Kenny Root2014-05-063-9/+83
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Add java.security.cert.Extension interfaceKenny Root2014-05-063-9/+83
|/ / / / | | | | | | | | | | | | | | | | | | | | Also convert our existing Extension class to implement this interface. Change-Id: I123ef6aa4f89897037e51f221c8c5a7994ac2a01
* | | | Merge "Revert "Libcore: Remove <> in CloseGuardMonitor test class""Andreas Gampe2014-05-061-2/+2
|\ \ \ \
| * | | | Revert "Libcore: Remove <> in CloseGuardMonitor test class"Andreas Gampe2014-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dalvik-dev has switched to Java 7 now, so diamonds are allowed now. This reverts commit 307e642f661f73cf22fa689ee40181481768c400. Change-Id: Ia1893bfea09aa2de65fed997bc3e5e3805d92387
* | | | | Merge "Fix BN to use correct size of array"Narayan Kamath2014-05-061-1/+1
|\ \ \ \ \
| * | | | | Fix BN to use correct size of arraySerguei Katkov2014-05-061-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NativeBN_litEndInts2bn uses len as a size of the generated array while it should be wlen for 64-bit. This will fix the following BigIntegerTest cases: - BigIntegerTest#test_Constructor_ILjava_util_Random - BigIntegerTest#test_hashCode Change-Id: Ife98d11cf94cd5568e55163f98fc4fe3de9d3918 Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com> Reported-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | Merge "Improve the performance of Annotation checks"Neil Fuller2014-05-062-53/+21
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve the performance of Annotation checksNeil Fuller2014-03-282-53/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the circumstance where the annotated element (field/ method/constructor/class) was loaded from a different Dex file than the annotation: The previous code would perform a binary search to determine the type ID of the annotation in the Dex file of the annotated element. That type ID would then be compared against the type IDs of annotations present on the annotated element. The binary search was quite expensive: it involved various indirections, many small native method calls and temporary String creation. Instead, the code now compares the names of the annotations on the annotated element with the name of the annotation being searched for. The name of the annotation is known and cached on the class and is therefore cheap to get. The name was previously being used to binary search for the type ID so this appears to be no less correct. Also removed some unused methods in order to delete the getFieldIndex() method. Change-Id: Ib8fb021ddf1221e3eac983aa87e7aea8174720ef
* | | | | Merge "SSLEngineResult: better exception messages"Kenny Root2014-05-051-4/+4
|\ \ \ \ \
| * | | | | SSLEngineResult: better exception messagesKenny Root2014-05-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring these exception messages more in line with what the rest of libcore uses. Also print out the value that caused an exception to be thrown to aid in debugging. Change-Id: Ia2244592781091da9c3239c5f61946f6fb806204
* | | | | | Merge "Relax the chen/shen test."Elliott Hughes2014-05-051-6/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Relax the chen/shen test.Elliott Hughes2014-05-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 沈 should sort as either 'C' or 'S', depending on context. Either choice is wrong some of the time, so relax the CTS test so OEMs can choose when they'd rather be wrong. (We default to being wrong in contacts.) Bug: https://code.google.com/p/android/issues/detail?id=69117 Change-Id: I8e6c9ea201d89d3cefc617b43ce908093f02acd7
* | | | | | Merge "Libcore: Remove <> in CloseGuardMonitor test class"Andreas Gampe2014-05-031-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Libcore: Remove <> in CloseGuardMonitor test classAndreas Gampe2014-05-021-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regrettably we're stuck with Java 1.6 in some branches, which will not accept the diamond operator. Change-Id: Iab1bd30bdcd70e312c2809a42d2339e0503a3250
* | | | | Merge "Add finalizer references in native code."Mathieu Chartier2014-05-021-3/+0
|\ \ \ \ \
| * | | | | Add finalizer references in native code.Mathieu Chartier2014-05-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finalizers are now added from native code in the allocation code path. This is an optimization since some of the entrypoints aren't used for finalizable objects and therefore we can eliminate the check. Bug: 14078487 Change-Id: I7edba4c884abec23678e59eb7480abc344f1ffa8
* | | | | | Merge "Remove a printStackTrace()"Neil Fuller2014-05-021-1/+0
|\ \ \ \ \ \
| * | | | | | Remove a printStackTrace()Neil Fuller2014-05-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64cfc1b91ee64c4095f541de6d0894f6222d43b9
* | | | | | | Merge "Add 2 additional interruption test cases"Neil Fuller2014-05-021-1/+83
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add 2 additional interruption test casesNeil Fuller2014-04-291-1/+83
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding test cases for FileChannels that are used when a thread has already been interrupted. Change-Id: Ia9086f509f45d226f12a28f3afde9001c7b164bc
* | | | | | Merge "Improve detection of CloseGuard protected resource leakage"Paul Duffin2014-05-028-127/+365
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve detection of CloseGuard protected resource leakagePaul Duffin2014-05-018-127/+365
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add CloseGuardMonitor to intercept and collate CloseGuard reports and if necessary throw an exception listing the resource leaks. * Add ResourceLeakageDetector to abstract away the CloseGuardMonitor which will not work on RI. * Add AbstractResourceLeakageDetectorTestCase as a base class for tests that need to detect resource leaks, in future this could be handled by modifications to Cts and Vogar test runners. * Remove CloseGuardTester and its sole usage in ProcessBuilderTest. * Remove CloseGuardGuard from within URLConnectionTest * Change ZipFileTest, ProcessBuilderTest, URLConnectionTest to use new mechanism, fix issues that are identified and do some cleanup/remove duplicated code. Bug: https://code.google.com/p/android/issues/detail?id=66383 Change-Id: Id026dbb6bc66091a15f07329e6371cd0d1f32cf5
* | | | | Merge "Add an instructionSet argument to isDexOptNeededInternal."Narayan Kamath2014-05-011-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
generated by cgit v1.1 at 2025-02-05 15:08:33 +0000