Skip to content

Commit

Permalink
Merge pull request #6073 from yschimke/android_init_ordering
Browse files Browse the repository at this point in the history
Fix Android Platform init
  • Loading branch information
swankjesse committed May 20, 2020
2 parents 9c173d2 + 1d183cb commit b733d29
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion okhttp/src/main/kotlin/okhttp3/internal/platform/Platform.kt
Expand Up @@ -186,7 +186,8 @@ open class Platform {

// This explicit check avoids activating in Android Studio with Android specific classes
// available when running plugins inside the IDE.
val isAndroid = "Dalvik" == System.getProperty("java.vm.name")
val isAndroid: Boolean
get() = "Dalvik" == System.getProperty("java.vm.name")

private val isConscryptPreferred: Boolean
get() {
Expand Down

0 comments on commit b733d29

Please sign in to comment.