summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | am c4206083: am e001824e: Merge "Do not throw exception on Mac#reset"Kenny Root2013-09-252-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c42060836bdc3a2f0b22b01325b1280faa191785': Do not throw exception on Mac#reset
| * | | | | | | | | | | | | | | | | | | | | am e001824e: Merge "Do not throw exception on Mac#reset"Kenny Root2013-09-252-13/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e001824e5cc11092fec81e91dd2f1accbf492382': Do not throw exception on Mac#reset
| | * | | | | | | | | | | | | | | | | | | | Merge "Do not throw exception on Mac#reset"Kenny Root2013-09-252-13/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Do not throw exception on Mac#resetKenny Root2013-09-252-13/+18
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSLMac was not checking whether it was initialized before dereferencing its macKey field. This caused callers to Mac#reset() before Mac#init() to get a NullPointerException. Bug: https://code.google.com/p/android/issues/detail?id=58179 Change-Id: I8523983fec578079a66a04d585c1ddbe7732575e
* | | | | | | | | | | | | | | | | | | | | am de7c3cf7: am 5444a8ef: Merge "Fix Java 7 build."Brian Carlstrom2013-09-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de7c3cf71a67cfd0a936340769170eb089cd6eba': Fix Java 7 build.
| * | | | | | | | | | | | | | | | | | | | am 5444a8ef: Merge "Fix Java 7 build."Brian Carlstrom2013-09-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5444a8ef87dc014f79914d78f468cc65fda10c77': Fix Java 7 build.
| | * | | | | | | | | | | | | | | | | | | Merge "Fix Java 7 build."Brian Carlstrom2013-09-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Fix Java 7 build.Ying Wang2013-09-201-1/+1
| | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://bugs.sun.com/view_bug.do?bug_id=6904536 Bug: 8992787 (cherry-picked from a9a297845620cfe56bbe3b9f8de1331b7ec54574) Change-Id: I14ff930b02914563493fbcd971f3393fa0c12105
* | | | | | | | | | | | | | | | | | | | | am 94b1bae4: Merge commit \'a6e22fc9\' into manualmergeIan Rogers2013-09-238-166/+402
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '94b1bae43287c5c8e2d31d05d4f68441acf667ab': Avoid computing class def indices.
| * | | | | | | | | | | | | | | | | | | | Merge commit 'a6e22fc9' into manualmergeIan Rogers2013-09-238-166/+402
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libdvm/src/main/java/java/lang/Class.java Change-Id: I03e7a0ad53ec4c3482e75c0a189649a44cdec3a0
| | * | | | | | | | | | | | | | | | | | | Avoid computing class def indices.Ian Rogers2013-09-218-166/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10244719 Also tidy AnnotationAccess. (cherry-picked from 8b2c0b9abc3f520495f4387ea040132ba85cae69) Change-Id: I6ec8fd4e36b428d7e16e01d98b7bebc143fac8c3 Conflicts: libdvm/src/main/java/java/lang/Class.java
* | | | | | | | | | | | | | | | | | | | | am b80808d7: am 98430d0d: Fix getGenericInterfaces for the no annotation case.Ian Rogers2013-09-232-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b80808d79017cb1be406ffdc67fb26cc15c65eea': Fix getGenericInterfaces for the no annotation case.
| * | | | | | | | | | | | | | | | | | | | am 98430d0d: Fix getGenericInterfaces for the no annotation case.Ian Rogers2013-09-232-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98430d0d75f4cfd40614b77debeb3c8d0abf40df': Fix getGenericInterfaces for the no annotation case.
| | * | | | | | | | | | | | | | | | | | | Fix getGenericInterfaces for the no annotation case.Ian Rogers2013-09-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10244719 (cherry-picked from 43111aab512b1a7c7c8095a7135a7ae2754ea5bd) Change-Id: I758d32e9cffcabf771e6f5f86ffa2666c8e1cb02 Conflicts: libdvm/src/main/java/java/lang/Class.java
* | | | | | | | | | | | | | | | | | | | | am 3f1ad69e: Merge commit \'d4ec55c4\' into manualmergeIan Rogers2013-09-2313-261/+330
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f1ad69ef4655901cbf71c4c1fbae074bc320585': Lazier annotation signature parsing.
| * | | | | | | | | | | | | | | | | | | | Merge commit 'd4ec55c4' into manualmergeIan Rogers2013-09-2313-261/+330
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libdvm/src/main/java/java/lang/Class.java Change-Id: Ib634a11b66deb2a1a81b421b5de26a8f4a8c8746
| | * | | | | | | | | | | | | | | | | | | Lazier annotation signature parsing.Ian Rogers2013-09-2113-257/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10244719. Also, make wider use of empty arrays. Also, use named inner classes to aid profiling. Remove caching as the empty result will be fast. Porting the ART changes to DVM, to avoid the caching, results in bringing in a bunch of other ART clean-up. TODO, avoid modified-UTF8 to String conversions by Dex. Change-Id: I051b6e34b5a4e7a7f1383461a799755947a5ba36 Conflicts: libdvm/src/main/java/java/lang/Class.java
* | | | | | | | | | | | | | | | | | | | | Merge "Fix Java 7 build."Ying Wang2013-09-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix Java 7 build.Ying Wang2013-09-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://bugs.sun.com/view_bug.do?bug_id=6904536 Bug: 8992787 Change-Id: Ib84a28a3df4517be86cd3342e6f916a5d905be89
* | | | | | | | | | | | | | | | | | | | | | am f7c1e44e: am 4df0e797: Merge "Add a missing expectation for ↵Elliott Hughes2013-09-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASCIICharsetEncoderTest." * commit 'f7c1e44e9dccbba63d4e587a7bf64c188e7ccc3c': Add a missing expectation for ASCIICharsetEncoderTest.
| * | | | | | | | | | | | | | | | | | | | | am 4df0e797: Merge "Add a missing expectation for ASCIICharsetEncoderTest."Elliott Hughes2013-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4df0e797fd724e2efb35de21d83ea093789fb2de': Add a missing expectation for ASCIICharsetEncoderTest.
| | * | | | | | | | | | | | | | | | | | | | Merge "Add a missing expectation for ASCIICharsetEncoderTest."Elliott Hughes2013-09-191-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Add a missing expectation for ASCIICharsetEncoderTest.Elliott Hughes2013-09-191-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10837242 Bug: 10729779 Change-Id: I014f8646b8782973c13a3a327b4fba8b90e8d0cb
* | | | | | | | | | | | | | | | | | | | | | am c09072f8: am 12f0b005: Add a missing expectation for ASCIICharsetEncoderTest.Elliott Hughes2013-09-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c09072f8c61755eed6b961699b2497a596412bea': Add a missing expectation for ASCIICharsetEncoderTest.
| * | | | | | | | | | | | | | | | | | | | | am 12f0b005: Add a missing expectation for ASCIICharsetEncoderTest.Elliott Hughes2013-09-191-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12f0b0057dc5fc8a157b45c79cf75e54eafa8f40': Add a missing expectation for ASCIICharsetEncoderTest.
| | * | | | | | | | | | | | | | | | | | | | Add a missing expectation for ASCIICharsetEncoderTest.Elliott Hughes2013-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10837242 Bug: 10729779 (cherry picked from commit 189df91cdff73cf78862df947c8d23b9b9c91b82) Change-Id: I121f60070f9e79c105a029fd18310fa514046d03
* | | | | | | | | | | | | | | | | | | | | | am ac3c4358: am f08f1687: Fix ↵Elliott Hughes2013-09-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation. * commit 'ac3c4358f93c57eacd603437fa87d9defadbfee4': Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation.
| * | | | | | | | | | | | | | | | | | | | am f08f1687: Fix ↵Elliott Hughes2013-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation. * commit 'f08f1687a0a6424c1fc6a5988006c0a1163365ff': Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation.
| | * | | | | | | | | | | | | | | | | | | Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode ↵Elliott Hughes2013-09-191-2/+2
| | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expectation. Bug: 10837475 Change-Id: Ic9de8cda2a8cf3ea11b1ca21e6c1485c1c5b76d6
* | | | | | | | | | | | | | | | | | | | am dcd388b8: am eddb74ec: Merge "Try to fix the continuous build by building ↵Brian Carlstrom2013-09-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libjavacore.so." * commit 'dcd388b8a388c45e146a006360fd899b8741227c': Try to fix the continuous build by building libjavacore.so.
| * | | | | | | | | | | | | | | | | | | am eddb74ec: Merge "Try to fix the continuous build by building libjavacore.so."Brian Carlstrom2013-09-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eddb74ec19aa9e22faf2dd8ec74133025f05553f': Try to fix the continuous build by building libjavacore.so.
| | * | | | | | | | | | | | | | | | | | Merge "Try to fix the continuous build by building libjavacore.so."Brian Carlstrom2013-09-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Try to fix the continuous build by building libjavacore.so.Elliott Hughes2013-09-181-0/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 0d302d7c175790ce6ea25e0b1d7981426f8379d4) Change-Id: Ia482a15b2a8cfe9a08c63068cd1d3dd1e4d4d0b3
* | | | | | | | | | | | | | | | | | | | am e1bf6983: am cc134af4: Merge "Fix dalvik-host libjavacrypto dependency"Brian Carlstrom2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1bf698304a1ea94bb69d3efeb0e0d7cf59ad9da': Fix dalvik-host libjavacrypto dependency
| * | | | | | | | | | | | | | | | | | | am cc134af4: Merge "Fix dalvik-host libjavacrypto dependency"Brian Carlstrom2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc134af4c7427a098b790b394574b9c13b1724ec': Fix dalvik-host libjavacrypto dependency
| | * | | | | | | | | | | | | | | | | | Merge "Fix dalvik-host libjavacrypto dependency"Brian Carlstrom2013-09-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix dalvik-host libjavacrypto dependencyBrian Carlstrom2013-09-181-1/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e856f6d5dbbc6a852a698ae495a8e83356434f2
* | | | | | | | | | | | | | | | | | | | am 703745c8: am d058512d: Merge "Split Conscrypt makefile out from libcore"Kenny Root2013-09-174-136/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '703745c882c5acf12e102a92aff28fd22c5faab0': Split Conscrypt makefile out from libcore
| * | | | | | | | | | | | | | | | | | | am d058512d: Merge "Split Conscrypt makefile out from libcore"Kenny Root2013-09-174-136/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd058512d7f68bf4dbbd7775b879bc926c23816d0': Split Conscrypt makefile out from libcore
| | * | | | | | | | | | | | | | | | | | Merge "Split Conscrypt makefile out from libcore"Kenny Root2013-09-174-136/+194
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Split Conscrypt makefile out from libcoreKenny Root2013-09-164-136/+194
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
* | | | | | | | | | | | | | | | | | | | am 6646cfe8: am 0a455b00: Merge "Remove BC workaround in TestKeyStore"Kenny Root2013-09-131-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6646cfe8342426981dde0051ffb17ca094b0a478': Remove BC workaround in TestKeyStore
| * | | | | | | | | | | | | | | | | | | am 0a455b00: Merge "Remove BC workaround in TestKeyStore"Kenny Root2013-09-131-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a455b00964add31681d101091d40e049c543fee': Remove BC workaround in TestKeyStore
| | * | | | | | | | | | | | | | | | | | Merge "Remove BC workaround in TestKeyStore"Kenny Root2013-09-141-8/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Remove BC workaround in TestKeyStoreKenny Root2013-09-131-8/+0
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At one point in time, BC had a bug where it couldn't work with other EC keys. This has since been fixed, so this workaround is no longer needed. Change-Id: I0fb3f4d207fb5093e3bd1e1256cc3e165ecae8b0
* | | | | | | | | | | | | | | | | | | | am 2c9e33e3: am 16882522: Merge "Clean up CharsetDecoder and CharsetEncoder."Elliott Hughes2013-09-138-262/+235
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c9e33e32f89dd6c8461474cdd8949f1b06adca3': Clean up CharsetDecoder and CharsetEncoder.
| * | | | | | | | | | | | | | | | | | | am 16882522: Merge "Clean up CharsetDecoder and CharsetEncoder."Elliott Hughes2013-09-138-262/+235
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16882522e9c5fd8e153b45b25df6bcf70fabb914': Clean up CharsetDecoder and CharsetEncoder.
| | * | | | | | | | | | | | | | | | | | Merge "Clean up CharsetDecoder and CharsetEncoder."Elliott Hughes2013-09-138-262/+235
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Clean up CharsetDecoder and CharsetEncoder.Elliott Hughes2013-09-138-262/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also fixes a few bugs, and a few test bugs, and then the bugs exposed by fixing those tests. Change-Id: Id52f8d9d8c812847ed7af36e8f8721c933f819c1
* | | | | | | | | | | | | | | | | | | | | am 4521ce1e: am 6dc88581: Merge "Revert "Restore ↵Kenny Root2013-09-131-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NativeCrypto#encodeCertificates for now"" * commit '4521ce1eb17db0811d439cbc5f313a2f3ea0fdb4': Revert "Restore NativeCrypto#encodeCertificates for now"
generated by cgit v1.1 at 2025-02-10 10:38:30 +0000