summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 5888feb6: Merge "Blacklist a known failure in GregorianCalendarTest."Narayan Kamath2014-05-122-5/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5888feb645bff10b6dc0529e07ce0350cb63f997': Blacklist a known failure in GregorianCalendarTest.
| * | | | Merge "Blacklist a known failure in GregorianCalendarTest."Narayan Kamath2014-05-122-5/+12
| |\ \ \ \
| | * | | | Blacklist a known failure in GregorianCalendarTest.Narayan Kamath2014-05-122-5/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issues here relate to how we deal with ambiguous wall clock times, i.e, wall clock values that we "skip" when we move the clock forward when transitioning into daylight savings, and wall clock times that occur twice when we move the clock backward This isn't a regression. We've never handled this correctly. bug: 12778197 Change-Id: Ida79583c02c6895096a8afdd8f59b1002b282d32
* | | | | am 5c1acb43: Merge "Add android.system.Os.link for link(2)."Elliott Hughes2014-05-106-0/+26
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5c1acb43c314a7048341f1ab36799fb6675505f4': Add android.system.Os.link for link(2).
| * | | | 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
* | | | am 567dcb29: Merge "Fix various errors in FileURLConnectionTest."Narayan Kamath2014-05-093-40/+186
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '567dcb29cba8be9abf154f21e9c1ff47a81ad9cc': Fix various errors in FileURLConnectionTest.
| * | | 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
* | | | am 4f1bfee1: Merge "Add missing \'const\'."Elliott Hughes2014-05-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4f1bfee1a72d7842aa5ce565463ab20466368213': Add missing 'const'.
| * | | Merge "Add missing 'const'."Elliott Hughes2014-05-091-1/+1
| |\ \ \
| | * | | Add missing 'const'.Elliott Hughes2014-05-081-1/+1
| | | |/ | | |/| | | | | | | | | Change-Id: I20311836b80bc655a5ae389ef2f49b2a09f79744
* | | | am 80e73159: Merge "SSLSocketTest: fix some flaky tests"Kenny Root2014-05-081-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '80e731591eda358739d43ffaa2d22635e1ab9fdb': SSLSocketTest: fix some flaky tests
| * | | 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
* | | | | am 13bb5c1b: Merge "Add CRLReason and friends"Kenny Root2014-05-089-3/+477
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '13bb5c1b5d3ccd844f330734f46d1f7dd27f9094': Add CRLReason and friends
| * | | | 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
* | | | | | am ce2bc2c4: Merge "Handle Reference.get in native code."Mathieu Chartier2014-05-082-0/+198
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ce2bc2c4f5282f977b444886ba910e5b1928ef72': Handle Reference.get in native code.
| * | | | | 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
* | | | | | am 73f428dc: Merge "Use the right class loader in ProxyTest."Narayan Kamath2014-05-081-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '73f428dc37be1294887f4a74b46106972b6de5f0': Use the right class loader in ProxyTest.
| * | | | | 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
* | | | | | am 4258671e: Merge "Blacklist ControlTest test case."Neil Fuller2014-05-081-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4258671ecb6f1fe955055994dd975ec57374e478': Blacklist ControlTest test case.
| * | | | | 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
* | | | | | | am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4abcf7ad18a9b96999f5df60b572d355dfdcefe5': KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types
| * | | | | | 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
* | | | | | | am 0ce04075: Merge "NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5"Kenny Root2014-05-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0ce0407596b675b04e472595338aafa1dec6bd04': NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5
| * | | | | | 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
* | | | | | am 5b8b1ea0: Merge "Ensure consistent (backwards-compatible) capitalization ↵Elliott Hughes2014-05-082-126/+133
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for yesterday/today/tomorrow." * commit '5b8b1ea0a23702a376c996bac57cddaaf1d9b39b': Ensure consistent (backwards-compatible) capitalization for yesterday/today/tomorrow.
| * | | | | 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
* | | | | | am 5a9c2b9e: Merge "Basic documentation for android.system."Elliott Hughes2014-05-0710-36/+511
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5a9c2b9e273e976c8a8e81357fe290077b766fec': Basic documentation for android.system.
| * | | | | 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
* | | | | | am d8eb43c1: Merge "Change ReferenceQueue order from LIFO to FIFO."Narayan Kamath2014-05-071-9/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd8eb43c1072f8467ae01ab93944c1032c94c6ccc': Change ReferenceQueue order from LIFO to FIFO.
| * | | | | 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>
* | | | | | | am db3cbbc3: Merge "Add java.security.cert.Extension interface"Kenny Root2014-05-063-9/+83
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'db3cbbc355adbe08926881ef86a1e18fa6a475b1': Add java.security.cert.Extension interface
| * | | | | | 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
* | | | | am f560c538: Merge "Revert "Libcore: Remove <> in CloseGuardMonitor test class""Andreas Gampe2014-05-061-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f560c538e8cb2750502c7337cae86c536e44ca8d': Revert "Libcore: Remove <> in CloseGuardMonitor test class"
| * | | | 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
* | | | | | am 32ec257f: Merge "Fix BN to use correct size of array"Narayan Kamath2014-05-061-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '32ec257fae8b9d9bede551f00400f0a5216ab6b9': Fix BN to use correct size of array
generated by cgit v1.1 at 2025-03-24 07:24:09 +0000