diff --git a/src/main/java/rx/internal/util/PlatformDependent.java b/src/main/java/rx/internal/util/PlatformDependent.java index 1a48e8067b..2b6d5c6e65 100644 --- a/src/main/java/rx/internal/util/PlatformDependent.java +++ b/src/main/java/rx/internal/util/PlatformDependent.java @@ -15,9 +15,6 @@ */ package rx.internal.util; -import java.security.AccessController; -import java.security.PrivilegedAction; - /** * Allow platform dependent logic such as checks for Android. * @@ -67,7 +64,7 @@ public static int getAndroidApiVersion() { private static int resolveAndroidApiVersion() { try { return (Integer) Class - .forName("android.os.Build$VERSION", true, getSystemClassLoader()) + .forName("android.os.Build$VERSION") .getField("SDK_INT") .get(null); } catch (Exception e) { // NOPMD @@ -76,20 +73,4 @@ private static int resolveAndroidApiVersion() { return ANDROID_API_VERSION_IS_NOT_ANDROID; } } - - /** - * Return the system {@link ClassLoader}. - */ - static ClassLoader getSystemClassLoader() { - if (System.getSecurityManager() == null) { - return ClassLoader.getSystemClassLoader(); - } else { - return AccessController.doPrivileged(new PrivilegedAction() { - @Override - public ClassLoader run() { - return ClassLoader.getSystemClassLoader(); - } - }); - } - } } diff --git a/src/test/java/rx/internal/util/PlatformDependentTest.java b/src/test/java/rx/internal/util/PlatformDependentTest.java index 64f47915b1..b868145a83 100644 --- a/src/test/java/rx/internal/util/PlatformDependentTest.java +++ b/src/test/java/rx/internal/util/PlatformDependentTest.java @@ -19,9 +19,18 @@ import rx.TestUtil; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + public class PlatformDependentTest { @Test public void constructorShouldBePrivate() { TestUtil.checkUtilityClass(PlatformDependent.class); } + + @Test + public void platformShouldNotBeAndroid() { + assertFalse(PlatformDependent.isAndroid()); + assertEquals(0, PlatformDependent.getAndroidApiVersion()); + } }