tag 6b6db8a0932faf54bdd04ae0bcef9fc561d7d089
tagger The Android Open Source Project <initial-contribution@android.com> Wed Dec 22 11:39:05 2010 -0800
object 5bcbe1c84468a25fec1e5b4e1dd636f917c73422

Android 2.3.1 release 1

commit 5bcbe1c84468a25fec1e5b4e1dd636f917c73422
author Brian Carlstrom <bdc@google.com> Mon Nov 15 17:39:18 2010 -0800
committer Brian Carlstrom <bdc@google.com> Tue Nov 16 16:36:27 2010 -0800
tree 8b263d5914d48b0b000c37f049d9588a4e13c0bf
parent 3825a7f63f6bf49d55e742f19f9b76cc9adc5e6f

HttpsURLConnectionTest rewrite and URLConnectionTest updates

Rewrote HttpsURLConnectionTest to work with current SSLSocket
implementation which more strictly follows RI behavior.

Also made upates to URLConnectionTest related to HttpsURLConnection
- changed assertContent call connect() explictly to illustrate problem
  with https proxy case also seen by HttpsURLConnectionTest
- Rewrote testConnectTimeouts to work reliably. Before if often
  worked on WiFi but not on mobile networks where a "HTTP/1.1 501 Bad
  Gateway" would be seen causing a FileNotFoundException.
- Changed testConnectViaHttpProxyToHttpsUsingHttpProxySystemProperty
  to match expectation that https does not use the http.proxyHost
  values. Added new testConnectViaHttpProxyToHttpsUsingProxyArgWithNoProxy
  which should have the same behavior as the fixed
  testConnectViaHttpProxyToHttpsUsingHttpProxySystemProperty

git cherry-pick -e f02c695ed03e708623d9365dec26d533356ef2d0

Bug: 3184701
Change-Id: Id25f619d2437db607deaf35aeb1d5e817514b92f