GitLab

Bug: 10424240

(cherry picked from commit cc9eae50)

Change-Id: Id62d69926235912d047c71975bdb541f1cf67ad7

* commit 'db102c68':
  CTS test fail because Zhuyin(Bopomofo) used.

* commit 'b70a6d96':
  CTS test fail because Zhuyin(Bopomofo) used.

(cherry picked from commit c242577b)

Bug: 10424836
Change-Id: I99e6722ef898baa7f9a2d56e84e88aae5a6c9f4a

Test for multiple schemes and multiple auth headers, but
insist that one of schemes is "Basic".

Fixes CTS tests
URLConnectionTest#testAuthenticateWithCommaSeparatedAuthenticationMethods
URLConnectionTest#testAuthenticateWithMultipleAuthenticationHeaders

(cherry picked from d1b438d5)

bug: 10211309

Change-Id: Icdc30a5c52cc2c8e3b65abe402732658d4308a88

This is a renamed version of testGetKeepAlive, which wasn't
testing very much in its old form.

(cherry picked from 35e58c07)

bug: 10211309

Change-Id: I08c46f577741817b7de714d362f3426d17984042

Test them in a slightly more robust manner.
- Rely on the fallback from Modern TLS for the retry, instead
  of a fallback due to a closed socket.
- Use mode DISCONNECT_AFTER_READING_RESPONSE to make sure the
  response is consumed before being discarded.

(cherry picked from 2f1d4ee6)

bug: 10211309

Change-Id: I8227148e1fc04b7557a41ee6485ffe98efb77ace

Track changes in ag/63871 which add bookkeeping requests
to the request queue.

(cherry picked from b27031a3)

bug: 10211309

Change-Id: I8093bda336950846dafaaba2acaace8ee52713d6

The test must account for the fact that the connection
will be retried with TLS_MODE_COMPATIBLE if the first
attempt throws an exception.

It's also worth noting that MockWebServer does not
deal with abrupt client disconnections in a particularly
graceful manner (but that does not affect the test,
and I'll address it in a follow up).

(cherry picked from bfdb88fa)

bug: 10211309

Change-Id: I5bf8a8e890df4146ecd0606e50c5a616434fd883

The 'zh_TW' is a character set for Taiwanese language. Taiwanese
commonly uses Zhuyin(Bopomofo) for sorting their language
instead of Pinyin(for Chinese) or Stroke(for HK).But, the test
case tests the 'zh_TW' for Stroke, not for Zhuyin(Bopomofo).
For example, in the result, the expected character [7劃] is
a index label of Stoke, but the occurred character [ㄕ] is
that of Bopomofo
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>

(cherry picked from commit c5816949)

Bug: 10349960
Change-Id: I3773bcb533be388ea7eb1ca7a961df87a0a0e3a2

The 'zh_TW' is a character set for Taiwanese language. Taiwanese
commonly uses Zhuyin(Bopomofo) for sorting their language
instead of Pinyin(for Chinese) or Stroke(for HK).But, the test
case tests the 'zh_TW' for Stroke, not for Zhuyin(Bopomofo).
For example, in the result, the expected character [7劃] is
a index label of Stoke, but the occurred character [ㄕ] is
that of Bopomofo
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>

(cherry picked from commit c5816949)

Bug: 10349960
Change-Id: Ifd0c28476717fc438cd1c06a3a899a0c52560026

Also improve the documentation for java.util.regex.Matcher and unify the Scanner tests.

Bug: 10310707
Bug: https://code.google.com/p/android/issues/detail?id=40555

(cherry picked from commit 56ff05b1)

Change-Id: I4d7ff44a77768821970c9bab560d5facdb75e1b9

(cherry picked from commit 82575d5d)

Bug: 6642616
Change-Id: I8e5d220b12bc1fef0ee1a4a5539e35986aece1dc

Moved from the external/apache-harmony tree to here.

(cherry picked from commit 3c9191d1)

Bug: 6642616
Change-Id: Ic1da2d340f7331809d19e9f559aacdd10b202b82

Change-Id: I7b71096aa5189c6f31d18931ebe95dc20478a9f1

Our earlier behaviour was somewhat broken. We'd accept
hosts with \u0000 in them, and then produce a request with
a bad Host header. We now fail on such requests, so add a
unit test to exercise that new behaviour.

The ideal behaviour might be to be lenient and escape characters
that we don't like. (This would involve using the URI from
URL#toUriLenient to populate the Host header. I attempted that
but it has the side effect of introducing a new set of
incompatibilities).

(cherry picked from aafc934e)

bug: 10211309

Change-Id: I38a0d39124dc5ca766a6e963e72b0250440e82ee

Test that usingProxy returns the right value even
after the disconnect() has been called on the connection.

(cherry picked from bcd90c94)

bug: 10209026
Change-Id: I5ac001e981fed73e88cf5bde548f8f1e72f3ff9f

Bug: 10310709

(cherry picked from commit ed3322f2)

Change-Id: I3f9ce080170ed49f46650420673ca27863381852

This was leaving bad OpenSSL error states lying around for later
innocent calls to trip over.

Also clean up some of the other error reporting/handling.

Bug: 9822466
Bug: 10344304

(cherry picked from commit 9fcf4ef5)

Change-Id: Ib446417dc8eaaad0f517340a8c9b012f25bb9b15

Added CAs in cacerts directory with summary below.

Added    Subject   : C=GR, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2011
         SHA1      : FE:45:65:9B:79:03:5B:98:A1:61:B5:51:2E:AC:DA:58:09:48:22:4D

Added    Subject   : C=IL, O=StartCom Ltd., CN=StartCom Certification Authority G2
         SHA1      : 31:F1:FD:68:22:63:20:EE:C6:3B:3F:9D:EA:4A:3E:53:7C:7C:39:17

Added    Subject   : CN=ACCVRAIZ1, OU=PKIACCV, O=ACCV, C=ES
         SHA1      : 93:05:7A:88:15:C6:4F:CE:88:2F:FA:91:16:52:28:78:BC:53:64:17

Added    Subject   : C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2012 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - EC1
         SHA1      : 20:D8:06:40:DF:9B:25:F5:12:25:3A:11:EA:F7:59:8A:EB:14:B5:47

Bug: https://code.google.com/p/android/issues/detail?id=36290
Bug: 9050922

Bug: https://code.google.com/p/android/issues/detail?id=55661
Bug: 9304475

Change-Id: I76a2398772c7c68f2284741f4bcfaf97d8789662

The isRegistered test is still failing. The problem is that icu4c's
convrtrs.txt has names like "windows-1252" that are both the canonical
name for one charset and an alias for another legacy charset. I need
to work out how to resolve that.

Bug: 10210999

(cherry picked from commit ea1caf4c)

Change-Id: I83cf1b9ae1d29f9956f443ef914a3e473e0f4692

(cherry picked from commit 00443571)

Bug: 6642616
Change-Id: I773dd31d92207151df05122920170851fa021fd5

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 bf1a9e10)

Bug: 10211309
Change-Id: I8aaab598d043b893e73fab9055082fa420cfb9cd

Bug: 9071417
Change-Id: Icdde3aace023d1d7509c932cdd71f203213b59d6

* commit 'f602b9df':
  Delay SSLSocketImpl instantiation until needed DO NOT MERGE

Change-Id: I51d47e30245aea615f08d9692c0b1fe9f00390ca

Bug: 10210999

(cherry picked from commit c44b103b)

Change-Id: If28d9e2eb3d1d148863f0a08c1e17371918fcaa2

Bug: 10014286.

(cherry picked from commit 1222a700a25956b0e3634731160017f0d3aa0585)

Change-Id: Ic5672489f6c028d47e6c2a499d6a2bbdd5cc4e4c

am 54c47192: am 03aa5ac1: am 5fb1308b: am d0e84f48: am 33c3583d: am e6cfe4d5: am a6d2b916: am 89c50e8b: Delay SSLSocketImpl instantiation until needed

* commit '54c47192':
  Delay SSLSocketImpl instantiation until needed