From e10d113678b25fe2b69182e512a31076773e99a2 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 30 May 2012 13:20:32 -0700 Subject: [PATCH] Do not report Android as Java 7 --- .../java/io/netty/util/internal/DetectionUtil.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/io/netty/util/internal/DetectionUtil.java b/common/src/main/java/io/netty/util/internal/DetectionUtil.java index 6fc2c356b7..fb23d0882e 100644 --- a/common/src/main/java/io/netty/util/internal/DetectionUtil.java +++ b/common/src/main/java/io/netty/util/internal/DetectionUtil.java @@ -61,6 +61,14 @@ public final class DetectionUtil { } private static int javaVersion0() { + // Android + try { + Class.forName("android.app.Application", false, ClassLoader.getSystemClassLoader()); + return 6; + } catch (Exception e) { + // Ignore + } + try { Deflater.class.getDeclaredField("SYNC_FLUSH"); return 7; @@ -70,7 +78,7 @@ public final class DetectionUtil { return 6; } - + private DetectionUtil() { // only static method supported }