summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 83c419d7: am c8cfc667: Preload DexCachesBrian Carlstrom2013-10-092-0/+9
|\ | | | | | | | | * commit '83c419d78e40c8bccc07ba3f118667b8bb958d30': Preload DexCaches
| * am c8cfc667: Preload DexCachesBrian Carlstrom2013-10-082-0/+9
| |\ | | | | | | | | | | | | * commit 'c8cfc667ddb82b08b889a24831a3d00cc6490bd9': Preload DexCaches
| | * Preload DexCachesBrian Carlstrom2013-10-082-0/+9
| | | | | | | | | | | | | | | Bug: 11045348 Change-Id: I3025d8f95e157af602b0ae91d974cb5e6678fb3d
* | | am be69fd8c: am 34b97151: merge in KFS78N (no-op)Ed Heyl2013-10-090-0/+0
|\ \ \ | |/ / | | | | | | * commit 'be69fd8c758836fa99f27aeada6f13881c558b4e':
| * | am 34b97151: merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
| |\ \ | | |/ | | | | | | * commit '34b971519e8d2689a26d0764d468fe4ad7346169':
| | * merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
| | |\
| | | * merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| | | |\
* | | | \ am 96c2e984: am 638fdab8: merge in KQS81MEd Heyl2013-10-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96c2e984c76f35c67a35aa0d7970a2b5f8a61d37': Add a missing expectation for ASCIICharsetEncoderTest. Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation. Add another test for HttpURLConnection#usingProxy Fix URLConnectionTest#testConnectTimeouts. Share ClassLoader code
| * | | | am 638fdab8: merge in KQS81MEd Heyl2013-10-080-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '638fdab88ff63941a08b51edbdb2d34463abbd35': Add a missing expectation for ASCIICharsetEncoderTest. Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode expectation. Add another test for HttpURLConnection#usingProxy Fix URLConnectionTest#testConnectTimeouts. Share ClassLoader code
| | * | | merge in KQS81MEd Heyl2013-10-080-0/+0
| | |\ \ \
| | | * | | Add a missing expectation for ASCIICharsetEncoderTest.Elliott Hughes2013-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10837242 Bug: 10729779 (cherry picked from commit 189df91cdff73cf78862df947c8d23b9b9c91b82) Change-Id: I121f60070f9e79c105a029fd18310fa514046d03
| | | * | | Fix libcore.java.nio.charset.OldCharset_MultiByte_UTF_16#test_Encode ↵Elliott Hughes2013-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expectation. Bug: 10837475 Change-Id: Ic9de8cda2a8cf3ea11b1ca21e6c1485c1c5b76d6
| | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-160-0/+0
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/|
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-110-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-090-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-020-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-290-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-280-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-270-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-220-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-210-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Add another test for HttpURLConnection#usingProxyNarayan Kamath2013-08-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that usingProxy returns the right value even after the disconnect() has been called on the connection. (cherry picked from bcd90c94df25762ef06654bf937960e20da) bug: 10209026 Change-Id: I5ac001e981fed73e88cf5bde548f8f1e72f3ff9f
| | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-200-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-08-190-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Fix URLConnectionTest#testConnectTimeouts.Narayan Kamath2013-08-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use StuckServer correctly. When StuckServer isn't in blocking mode, its local socket address isn't 127.0.0.1. Attempting to connect to localhost will then throw a SocketException (ECONNREFUSED) instead of a SocketTimeoutException. (cherry picked from commit bf1a9e10eefd28bb3a989df20b4a57c745fb3670) Bug: 10211309 Change-Id: I8aaab598d043b893e73fab9055082fa420cfb9cd
| | | | | | | | | | | | | | | | | | * Share ClassLoader codeBrian Carlstrom2013-08-156-906/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9071417 Change-Id: Icdde3aace023d1d7509c932cdd71f203213b59d6
* | | | | | | | | | | | | | | | | | | am 9b053422: am a3366b1f: Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b053422f2b1b2f835e1fb032b6dd6a8905c99be': ProviderTest: add special rules for Cipher
| * | | | | | | | | | | | | | | | | | am a3366b1f: Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3366b1f657ea7c2b8580612fbd9f174264459c5': ProviderTest: add special rules for Cipher
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | ProviderTest: add special rules for CipherKenny Root2013-10-071-16/+34
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cipher can have a special format where it can specify both its mode and padding along with the algorithm. This change takes that into account for tests by explicitly trying to get an instance of that type so providers that have "Cipher.AES" will satisfy the "Cipher.AES/CTR/NOPADDING" standard names requirement. Change-Id: If5bd395330082892b34c1b6250e3890fc7f92779
* | | | | | | | | | | | | | | | | | | | am b1e3075a: am d4a28a4a: Merge "Stop using deprecated ucol_safeClone ↵Elliott Hughes2013-10-071-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | placement functionality." * commit 'b1e3075af32d9ea04c61af2427ddf0e107bec075': Stop using deprecated ucol_safeClone placement functionality.
| * | | | | | | | | | | | | | | | | | | am d4a28a4a: Merge "Stop using deprecated ucol_safeClone placement ↵Elliott Hughes2013-10-071-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality." * commit 'd4a28a4aff348a19495c4e3e74924e1dcb5dfde0': Stop using deprecated ucol_safeClone placement functionality.
| | * | | | | | | | | | | | | | | | | | Merge "Stop using deprecated ucol_safeClone placement functionality."Elliott Hughes2013-10-071-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Stop using deprecated ucol_safeClone placement functionality.Elliott Hughes2013-10-071-2/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e8e659f72caf95d92638254226b78cf29bd0ca5
* | | | | | | | | | | | | | | | | | | | am b151db09: resolved conflicts for merge of b6fb99fd to klp-dev-plus-aospKenny Root2013-10-02137-39288/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b151db09530f8e6fd39576d0172333f77aba363f': Move conscrypt out to external/conscrypt
| * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of b6fb99fd to klp-dev-plus-aospKenny Root2013-10-02137-39288/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7823612ade542b0f988e34f0ca188c07db97b673
| | * | | | | | | | | | | | | | | | | | Merge "Move conscrypt out to external/conscrypt"Kenny Root2013-10-03137-39288/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Move conscrypt out to external/conscryptKenny Root2013-10-01137-39288/+1
| | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8895638441ceccb5d794238eb2c8f91a3028dcc9
* | | | | | | | | | | | | | | | | | | | am ba7e87db: am 34f81a14: ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba7e87db8b9a121e8fb3f8ee868f27054b124825': ZipFile: fix comparison for offset, pt 2
| * | | | | | | | | | | | | | | | | | | am 34f81a14: ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34f81a14c7c4002ab141ba90b2498974211b7df2': ZipFile: fix comparison for offset, pt 2
| | * | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the "byteOffset" value for the length calculation. Bug: 10947135 Change-Id: I6cbe3ed5552cd595020e8f3d0099daab6cada88e
* | | | | | | | | | | | | | | | | | | | am 8e3ffa3d: am a0f57f03: Merge "ZipFile: fix comparison for offset" into ↵Kenny Root2013-10-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '8e3ffa3d68611664ab5dceb8b918d9528458ea3b': ZipFile: fix comparison for offset
| * | | | | | | | | | | | | | | | | | | am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp-devKenny Root2013-10-021-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0f57f03512611f0c734d1cf00602f5c08bc593d': ZipFile: fix comparison for offset
| | * | | | | | | | | | | | | | | | | | Merge "ZipFile: fix comparison for offset" into klp-devKenny Root2013-10-011-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offsetKenny Root2013-10-011-4/+0
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "byteOffset" value for the reading buffer was being checked against the RandomAccessFile length value which didn't make much sense. Remove that line to restore sanity. Bug: 10947135 Change-Id: I4f85f5f1e162aeb19ff876a32e5b22bb876aacdb
* | | | | | | | | | | | | | | | | | | | am c1e8aa4b: am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c1e8aa4b8f60ba83ad74c3387fcef4ed52bfb017': Conscrypt: add missing libraries to JNI lib
generated by cgit v1.1 at 2025-02-04 03:15:28 +0000