Snap for 10453563 from e6157479ed9c9474a58577364ad9db8f079f3f3a to mainline-documentsui-release

Change-Id: I3459c5f601c63ec352f7a6a37e49b610ff956e7a
diff --git a/plugins/src/main/java/org/robolectric/android/plugins/AndroidLocalSdkProvider.java b/plugins/src/main/java/org/robolectric/android/plugins/AndroidLocalSdkProvider.java
index 91ea760..b1783d3 100644
--- a/plugins/src/main/java/org/robolectric/android/plugins/AndroidLocalSdkProvider.java
+++ b/plugins/src/main/java/org/robolectric/android/plugins/AndroidLocalSdkProvider.java
@@ -1,5 +1,7 @@
 package org.robolectric.android.plugins;
 
+import static android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
+
 import com.google.auto.service.AutoService;
 
 import org.robolectric.internal.dependency.DependencyResolver;
@@ -27,12 +29,7 @@
     protected void populateSdks(TreeMap<Integer, Sdk> knownSdks) {
         super.populateSdks(knownSdks);
         System.out.println("In android populate sdk.");
-        DefaultSdk localBuiltSdk = new DefaultSdk(
-                10000,
-                "current",
-                "r0",
-                "UpsideDownCake",
-                9);
+        DefaultSdk localBuiltSdk = new DefaultSdk(10000, "current", "r0", "UpsideDownCake", 9);
         File location = localBuiltSdk.getJarPath().toFile();
         AndroidVersions.AndroidRelease release = null;
         try {
@@ -40,14 +37,7 @@
             release = AndroidVersionInitTools.computeReleaseVersion(jarFile);
             System.out.println("Found release :" + release.toString());
             if (release != null) {
-                int jdkVersion = getMajorJdkVersion();
-                System.out.println("JDK version :" + jdkVersion);
-                DefaultSdk currentSdk = new DefaultSdk(
-                        release.getSdkInt(),
-                        "current",
-                        "r0",
-                        release.getShortCode(),
-                        jdkVersion);
+                DefaultSdk currentSdk = new DefaultSdk(release.getSdkInt(), "current", "r0", release.getShortCode(), 17);
                 for (int sdkInt : knownSdks.keySet()) {
                     if (sdkInt >= release.getSdkInt()) {
                         System.out.println("Removing :" + sdkInt);
@@ -64,10 +54,4 @@
             + "this prevents robolectric from determining which shadows to apply.", ioe);
         }
     }
-
-    private int getMajorJdkVersion() {
-        String javaVersion = System.getProperty("java.version");
-        String[] parts = javaVersion.split("\\.");
-        return Integer.valueOf(parts[0]);
-    }
 }