GitLab

* commit '4aaa292a':
  Revert "Remove support for duplicate file entries."

* commit '160dd055':
  Revert "Remove support for duplicate file entries."

* commit '4beeee87':
  Revert "Remove support for duplicate file entries."

This reverts commit 5360af4a

Ugh, forgot that make wouldn't make the tests anymore. We're missing the ZipException, I'll reupload in a second.

Change-Id: I8b4d7300cffa1f9f23235e2e33a1cf2b522ba3f3

* commit '843b12a8':
  Remove support for duplicate file entries.

* commit '6b26de17':
  Remove support for duplicate file entries.

* commit '5360af4a':
  Remove support for duplicate file entries.

Bug: 8219321
Change-Id: I4ac47f8facf13afa45799a0d5e20202a0ef5f0c6

* commit '60998d47':

* commit '52e40b6d':
  DO NOT MERGE

* commit '446c6e7c':
  DO NOT MERGE

* commit 'a0d32add':
  DO NOT MERGE

Disable SSL compression

Bug: 7079965

Change-Id: I8e060a827613e212bbcced66507fbf124bb04543

	modified:   luni/src/main/java/libcore/net/http/HttpConnection.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
	modified:   luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
	modified:   luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Central directories of zip files should be read lazily.
They are needed only to service calls to
BaseDexClassLoader#findResouce(s). Most android processes
don't use these methods since they use android resources.

bug:6797061

Change-Id: I1a5b5d03572601707e1fb1fd4424c1ae2fd2217d

Change-Id: I1e5f377e655f72b8d2e497e83cf4207f5b786e01

Bug: 7378963
Change-Id: I45fb1350baaf591e59b78bb3cf97091667cb079c

Bug: 7453821
Change-Id: I69408d0bb4063e34441ed1d7632fd1ccac39965b

Bug: 7355008
Change-Id: Ifdedca5cf5c96c86f94a0deead61e1798d1a495f

We can't rely on consuming all the listen(2) backlog. For the tests we've
seen fail because they sometimes connect rather than time out, switch to
an unroutable address.

(cherry-pick of babccbf9.)

Bug: 6971145
Change-Id: Ibfa412ff1ad7da7e63842d0162cc67a706e2b27e

Bug: 6951157
Change-Id: I4a23a90a4a54d71f9cc5f0c608a30000c8e1b033

Support_PortManager is a bad idea, badly implemented. Kill some more of it.
Only OldDatagramSocketTest still uses Support_PortManager, so hopefully we
can kill this completely soon.

Bug: 7347233
Change-Id: I9dec7b23d59edc8c7a5e391dd5ebccd2a92f82b5

Bug: 7337970
Change-Id: I7da3e22bc2c773258d30f0919d51d386f7b92e7d

Bug: 7337970
Change-Id: I17318afadd04d972f907fe968e050ece98116c6a

Includes cherry-pick of 847f22ad

Bug: 7192453
Change-Id: Ib5fa1e313d942d2c1034e8e7831af285ad24d71d

No clue what's wrong here, but we're seeing some flakiness in the
"connect" tests. Hopefully there will be a clue in this extra
output next time we see a failure.

(cherry-pick of 73587588.)

Bug: 6971145
Change-Id: I8236b2fb368581e2b6965898f109370e7e0af2e5