Use SdkVersionInfo#getAndroidName instead of local table

Change-Id: I7f177f023e7d47cae0823b2bf152411507e21124

1 files changed, 15 insertions, 37 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java
index 697a0bc..11896d8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java
@@ -20,7 +20,6 @@ import static com.android.SdkConstants.TOOLS_PREFIX;
 import static com.android.SdkConstants.TOOLS_URI;
 import static org.eclipse.ui.IWorkbenchPage.MATCH_INPUT;
 
-import com.android.SdkConstants;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.ide.common.sdk.SdkVersionInfo;
@@ -940,46 +939,25 @@ public class AdtUtils {
      * @return a suitable version display name
      */
     public static String getAndroidName(int api) {
-        // See http://source.android.com/source/build-numbers.html
-        switch (api) {
-            case 1:  return "API 1: Android 1.0";
-            case 2:  return "API 2: Android 1.1";
-            case 3:  return "API 3: Android 1.5 (Cupcake)";
-            case 4:  return "API 4: Android 1.6 (Donut)";
-            case 5:  return "API 5: Android 2.0 (Eclair)";
-            case 6:  return "API 6: Android 2.0.1 (Eclair)";
-            case 7:  return "API 7: Android 2.1 (Eclair)";
-            case 8:  return "API 8: Android 2.2 (Froyo)";
-            case 9:  return "API 9: Android 2.3 (Gingerbread)";
-            case 10: return "API 10: Android 2.3.3 (Gingerbread)";
-            case 11: return "API 11: Android 3.0 (Honeycomb)";
-            case 12: return "API 12: Android 3.1 (Honeycomb)";
-            case 13: return "API 13: Android 3.2 (Honeycomb)";
-            case 14: return "API 14: Android 4.0 (IceCreamSandwich)";
-            case 15: return "API 15: Android 4.0.3 (IceCreamSandwich)";
-            case 16: return "API 16: Android 4.1 (Jelly Bean)";
-            case 17: return "API 17: Android 4.2 (Jelly Bean)";
-            // If you add more versions here, also update LintUtils#getBuildCodes and
-            // SdkConstants#HIGHEST_KNOWN_API
-
-            default: {
-                // Consult SDK manager to see if we know any more (later) names,
-                // installed by user
-                Sdk sdk = Sdk.getCurrent();
-                if (sdk != null) {
-                    for (IAndroidTarget target : sdk.getTargets()) {
-                        if (target.isPlatform()) {
-                            AndroidVersion version = target.getVersion();
-                            if (version.getApiLevel() == api) {
-                                return getTargetLabel(target);
-                            }
-                        }
+        if (api <= SdkVersionInfo.HIGHEST_KNOWN_API) {
+            return SdkVersionInfo.getAndroidName(api);
+        }
+
+        // Consult SDK manager to see if we know any more (later) names,
+        // installed by user
+        Sdk sdk = Sdk.getCurrent();
+        if (sdk != null) {
+            for (IAndroidTarget target : sdk.getTargets()) {
+                if (target.isPlatform()) {
+                    AndroidVersion version = target.getVersion();
+                    if (version.getApiLevel() == api) {
+                        return getTargetLabel(target);
                     }
                 }
-
-                return "API " + api;
             }
         }
+
+        return "API " + api;
     }
 
     /**