summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid using point-to-point interfaces in multicast socket testsNeil Fuller2015-09-101-1/+4
| | | | | | | | | Multicast on a point-to-point interface isn't really multicast. Bug: 23279677 (cherry-picked from commit 67d7597da46910e65a089bcce0afa8e0c2bed668) Change-Id: Ib102e9d04744d3e99b8828ac31d9548e72b703dd
* merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-250-0/+0
|\
| * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-080-0/+0
| |\
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-060-0/+0
| | |\
| | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-010-0/+0
| | | |\
| | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-300-0/+0
| | | | |\
| | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-250-0/+0
| | | | | |\
| | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-150-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-140-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-130-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-030-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-250-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-240-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-230-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * ProviderTest: Add provider name to failure message.Narayan Kamath2015-06-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21870226 Change-Id: I1d91661599276394343b36a6601026ad46fc6b30
| | | | | | | | | | | | | | * libcore: removed unnecessary code in SSLSocketTestSergio Giro2015-06-171-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was possibly causing a race condition (see b/21776011), for instance, in case readFirstReceivedChunkFuture was still executing IoUtils#closeQuietly while the thread was cancelled. Bug: 21776011 (cherry picked from commit c22dd77f727262ed8105b8b638aeb817997914fd) Change-Id: Ibb20a98102d5bdc9ac3eaa0b875801ab218356f1
| | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-130-0/+0
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * | Send SIGQUIT when finalizer times outMathieu Chartier2015-06-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is to get a native stack trace of the thread if it is stuck in native code when runing a finalizer. Idea from agampe. Bug: 21060358 Change-Id: I370988e6a0067e1d407c21881c82e49b6adec050
| | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-110-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * | SSLEngineTest: set up server instead of using anonKenny Root2015-06-101-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was relying on "anon" cipher suites so that it didn't have to do any complicated setup of the server certificate store. Fortunately we already have a utility class we can use that does this setup for us so there is no need to rely on anonymous cipher suites that do no authentication. (cherry picked from commit 5be4c97a83895b7e1385445db6a1717eb8df3e9b) Bug: 21195269 Change-Id: I30bf4cd3b99bf946887cca293d616021cfce1bd7
| | | | | | | | | | | | | | | | * | SSLSocketTest: add test with no ciphersKenny Root2015-06-101-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no ciphers set, there should just be a handshake failure. However, Conscrypt was throwing InvalidArgumentException in this configuration. (cherry picked from commit def50a267d0100fa560cf7bbcd0b9a9d5f5e068f) Bug: 21195269 Change-Id: I73cfc4927041ca9b1331b58859382573e7de6f63
| | | | | | | | | | | | | | | | * | Fix X509CertificateTest.testVerifyPublicKeyString failure.Alex Klyubin2015-06-101-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was failing because it was making the wrong assumption that JCA's Signature implementation will select the implementation from the highest priority provider which offers the matching signature algorithm. This assumption is wrong because it does not take into consideration that JCA also filters providers using SupportedKeyClasses and SupportedKeyFormats attributes. In this particular case, AndroidKeyStore Provider happens to be the highest priority Provider which offers Signature.MD5withRSA. However, according to its declaration, it offers that only for public keys which are instances of AndroidKeyStorePublicKey. The fix is to rely on JCA's Signature implementation selection mechanism to find the highest priority provider which supports the desired public key. Bug: 21735869 Change-Id: Ie40f8a1cbf898966614a290c2d6cfe8350a1e99f
| | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-100-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * | Relax the test for inappropriate fallbackKenny Root2015-06-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't have a specific exception type for the SCSV inappropriate fallback cipher being used, we relied on scanning the cause message. BoringSSL has the error message of "INAPPROPRIATE_FALLBACK" which doesn't match the OpenSSL error message of "inappropriate fallback" so we need to relax the test a bit to accept both. This should be fine as we're just using the message as a proxy to determine whether the correct thing is done and not really trying to enforce a specific exception message. (cherry picked from commit 43e063b43daab0962554639dda272428a59f3c24) Bug: 21211765 Change-Id: I4e7cd5486c0eb8ab3e3f9b64b4e7234436ec4ee0
| | | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-090-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-060-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * | No need to test EC keys of 192 bitsKenny Root2015-06-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EC keys of 192 bits have a security level of 96 bits which is well below accepted minimum levels according to NIST SP800 131A. No need to be able to generate these anymore. Instead test 521-bit EC keys. (cherry picked from commit 9b8f9a1bb00f70f79f175282969d428d2aade062) Bug: 20563457 Change-Id: I674c255c55c910bb8f9ccdf1e5ad7f69a2bdac69
| | | | | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-040-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-030-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-020-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * | Add test_PacketSocketAddress to the list of known failures.Narayan Kamath2015-06-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs CAP_NET_RAW which means it can only ever run successfully as root. bug: 19764047 (cherry picked from commit 676fbcf150d23bb81da6dccd40bcd085a2eeee8a) Change-Id: I6c24cb9a781340d4c92fb53aa2670ddb99031c73
* | | | | | | | | | | | | | | | | | | | | | | | am 45b87713: am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and ↵Neil Fuller2015-08-241-37/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improvements for SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '45b87713e7b0a50ffa369a6e0674580281e37d38': Fixes and improvements for SerializationTest
| * | | | | | | | | | | | | | | | | | | | | | | am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for ↵Neil Fuller2015-08-241-37/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '3e8abdd9bdca823a635aac3adacf71ef227b18e1': Fixes and improvements for SerializationTest
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 57601a42: am d387c0ad: Merge "Fixes and improvements for ↵Neil Fuller2015-08-241-37/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializationTest" into lollipop-cts-dev automerge: 660504a * commit '57601a427ea58e17acdddba2b8eeda596937293c': Fixes and improvements for SerializationTest
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d387c0ad: Merge "Fixes and improvements for SerializationTest" into ↵Neil Fuller2015-08-241-37/+67
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lollipop-cts-dev automerge: 660504a * commit 'd387c0ad28ab75ede6039e763ba098e714075387': Fixes and improvements for SerializationTest
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 660504a * commit '660504acb29860588107fdf175768e9b036fd3ff': Fixes and improvements for SerializationTest
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fixes and improvements for SerializationTest" into lollipop-cts-devNeil Fuller2015-08-241-37/+67
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | Fixes and improvements for SerializationTestNeil Fuller2015-08-201-37/+67
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests were order-dependent and flawed: test support classes were used in multiple tests but each relied on it being possible to detect static initialization of those classes. There was an incorrect assertion. This change splits out unique test support classes for those that need them, adds more assertions and fixes the broken assertion. Also tidies up some warnings. Bug: 23031484 Change-Id: Ia3bb32dd1dbd02a74931604cae424d7e9312c76d (cherry picked from commit 729d4ecafff8e6af5a71e4fecb2007917cbc2e2a)
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 236dcb77: am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert ↵Neil Fuller2015-08-071-18/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit '236dcb7781bbacb52f9a0834198ca99379c87a84': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am cd07c28b: am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes ↵Neil Fuller2015-08-061-18/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit 'cd07c28b3c4178600bf38a55e9f4535d9034c6f9': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 8fd977f6: am bebe6fa7: Merge "Revert "Revert "Changes associated with an ↵Neil Fuller2015-08-061-18/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev * commit '8fd977f68fcf889c994fc2d3811d2452e63795ff': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| | | * | | | | | | | | | | | | | | | | | | | | | | | | am bebe6fa7: Merge "Revert "Revert "Changes associated with an OkHttp bad ↵Neil Fuller2015-08-061-18/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proxy response fix""" into lollipop-mr1-cts-dev * commit 'bebe6fa75dcc0198fbd2a10f1e147e0f62989745': Revert "Revert "Changes associated with an OkHttp bad proxy response fix""
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response ↵Neil Fuller2015-08-061-18/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix""" into lollipop-mr1-cts-dev
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Changes associated with an OkHttp bad proxy response fix""Neil Fuller2015-08-051-18/+8
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 11c3934f61c6c873fd9caae16947285bc0068965. commit 11c3934f61c6c873fd9caae16947285bc0068965 was incorrectly merged from lollipop-cts-dev into lollipop-mr1-cts-dev. Change-Id: I66fa65f08397fb34d6af1cb73d2c0fa7f57ef1b6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix FileUtilsTest.testCreateSubFile for Android One devices" into mnc-devNeil Fuller2015-08-063-30/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix FileUtilsTest.testCreateSubFile for Android One devicesNeil Fuller2015-08-053-30/+31
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createSubFile() was assuming that java.io.tmpdir did not itself contain symlink. Generally true, but not for Android One devices. Previously the createSubFile() would have tolerated a name parameter that directly referenced a symlink that pointed outside of the parent dir (though not if the symlink was actually dereferenced). This is unnecessarily lenient and making it stricter makes the code simpler. This fixes the FileUtils code and fixes/adds more cases to the FileUtilsTest to confirm it all works as intended when existing files and directories are present. This change only affects the TzDataBundleInstaller which is only executed in the event of an over-the-air timezone data update. Bug: 22836194 Change-Id: I05666c7387d469e79309a6fb0eeafba7e2a3299b
* | | | | | | | | | | | | | | | | | | | | | | | | | | am a84fc26d: am c1c9f15e: am 3a6966a3: am 8426987b: Merge "Revert "Changes ↵Neil Fuller2015-08-051-8/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev automerge: 34d183b * commit 'a84fc26d15aed853ec69632ceb5999ae9431be28': Revert "Changes associated with an OkHttp bad proxy response fix"
generated by cgit v1.1 at 2025-02-02 14:32:13 +0000