| commit | c237e0549138d7884e6c99422f2ae7533f191a88 | [log] [tgz] |
|---|---|---|
| author | Borjan Tchakaloff <borjan@fairphone.com> | Mon May 14 17:51:56 2018 +0200 |
| committer | Borjan Tchakaloff <borjan@fairphone.com> | Mon May 14 17:56:31 2018 +0200 |
| tree | fe0941f235f436e77ea380d27aec95947b70fbe7 | |
| parent | 97318456608006308dee01e14ef823eebd87789c [diff] | |
| parent | f96428a6cbb419e984a63e55636a7d15ced2d454 [diff] |
Merge the 2018-05-05 SPL branch from AOSP-Partner into int/n/fp2 * origin/security-aosp-nyc-mr2-release: Fix failing FileTest#test_canonicalCachesAreOff() Disable File.getCanonicalPath caches. Proper fix for rejecting ftp URL with /r/n. Revert "Reject ftp URLConnection containing /r/n in user info." Reject ftp URLConnection containing /r/n in user info. Test for rejection of ftp URL with /r/n in userinfo Issue: FP2N-106 Change-Id: I624f65b92c814cc6492e89562f81256dd7737a17