Skip to content

Fix resolveAndroidApiVersion when running under Robolectric #4912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akarnokd merged 1 commit into from
Dec 9, 2016
Merged

Fix resolveAndroidApiVersion when running under Robolectric #4912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions src/main/java/rx/internal/util/PlatformDependent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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
Expand All @@ -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<ClassLoader>() {
@Override
public ClassLoader run() {
return ClassLoader.getSystemClassLoader();
}
});
}
}
}
9 changes: 9 additions & 0 deletions src/test/java/rx/internal/util/PlatformDependentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}