SDK Manager: Make AVD names case-insensitive under Windows.

SDK Bug 2545530

Change-Id: I015b62ad21aea8fdf741b733d2c5f2a2b08d9e73

1 files changed, 9 insertions, 2 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
index cc679cf..c4914b2 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
@@ -432,22 +432,29 @@ public final class AvdManager {
 
     /**
      * Returns the {@link AvdInfo} matching the given <var>name</var>.
+     * <p/>
+     * The search is case-insensitive.
+     *
      * @param name the name of the AVD to return
      * @param validAvdOnly if <code>true</code>, only look through the list of valid AVDs.
      * @return the matching AvdInfo or <code>null</code> if none were found.
      */
     public AvdInfo getAvd(String name, boolean validAvdOnly) {
 
+        boolean ignoreCase = SdkConstants.currentPlatform() == SdkConstants.PLATFORM_WINDOWS;
+
         if (validAvdOnly) {
             for (AvdInfo info : getValidAvds()) {
-                if (info.getName().equals(name)) {
+                String name2 = info.getName();
+                if (name2.equals(name) || (ignoreCase && name2.equalsIgnoreCase(name))) {
                     return info;
                 }
             }
         } else {
             synchronized (mAllAvdList) {
                 for (AvdInfo info : mAllAvdList) {
-                    if (info.getName().equals(name)) {
+                    String name2 = info.getName();
+                    if (name2.equals(name) || (ignoreCase && name2.equalsIgnoreCase(name))) {
                         return info;
                     }
                 }