aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app/src
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-02-18 15:24:34 -0800
committerRaphael Moll <ralf@android.com>2011-02-18 15:31:38 -0800
commit2c6d48c1aee904dfa52baab73a53d8cda78717bb (patch)
tree740646bf18128dc7d5eff4921d8b40a20034b3bb /sdkmanager/app/src
parentfb22b5a1c1f96cdc06b02fda2143daaba0d338bc (diff)
downloadsdk-2c6d48c1aee904dfa52baab73a53d8cda78717bb.zip
sdk-2c6d48c1aee904dfa52baab73a53d8cda78717bb.tar.gz
sdk-2c6d48c1aee904dfa52baab73a53d8cda78717bb.tar.bz2
SDK manager fix for "force create AVD"
In the SDK Manager, creating an AVD would fail if there was some file or folder in the way (in the .android/avd folder) yet no AVD was loaded properly from it. This detects it, properly notifies the user and makes "force create AVD" work in this case. Change-Id: Ie0abc383fef568c1a7e98c14eb7d48fbc5d66616
Diffstat (limited to 'sdkmanager/app/src')
-rw-r--r--sdkmanager/app/src/com/android/sdkmanager/Main.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 1fe6d97..5fb1132 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -923,8 +923,7 @@ public class Main {
if (paramFolderPath != null) {
avdFolder = new File(paramFolderPath);
} else {
- avdFolder = new File(AndroidLocation.getFolder() + AndroidLocation.FOLDER_AVD,
- avdName + AvdManager.AVD_FOLDER_EXTENSION);
+ avdFolder = AvdManager.AvdInfo.getAvdFolder(avdName);
}
// Validate skin is either default (empty) or NNNxMMM or a valid skin name.