Merge "Remove usage of setEnabledCompressionMethods"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r21jb-mr1.1-releasejb-mr1.1-devjb-mr1.1-cts-devjb-mr1-releasejb-mr1-dev

1 files changed, 0 insertions, 6 deletions

diff --git a/android/main/java/libcore/util/Libcore.java b/android/main/java/libcore/util/Libcore.java
index cd32c17..88aeeaa 100644
--- a/android/main/java/libcore/util/Libcore.java
+++ b/android/main/java/libcore/util/Libcore.java
@@ -46,7 +46,6 @@ public final class Libcore {
     }
 
     private static final Class<?> openSslSocketClass;
-    private static final Method setEnabledCompressionMethods;
     private static final Method setUseSessionTickets;
     private static final Method setHostname;
     private static final Method setNpnProtocols;
@@ -57,8 +56,6 @@ public final class Libcore {
         try {
             openSslSocketClass = Class.forName(
                     "org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl");
-            setEnabledCompressionMethods = openSslSocketClass.getMethod(
-                    "setEnabledCompressionMethods", String[].class);
             setUseSessionTickets = openSslSocketClass.getMethod(
                     "setUseSessionTickets", boolean.class);
             setHostname = openSslSocketClass.getMethod("setHostname", String.class);
@@ -94,9 +91,6 @@ public final class Libcore {
 
         if (openSslSocketClass.isInstance(socket)) {
             try {
-                String[] compressionMethods = {"ZLIB"};
-                setEnabledCompressionMethods.invoke(socket,
-                        new Object[] {compressionMethods});
                 setUseSessionTickets.invoke(socket, true);
                 setHostname.invoke(socket, socketHost);
             } catch (InvocationTargetException e) {