diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:58 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:58 -0800 |
| commit | 6990abcbc03c25aeff94da27ed6893e7993d2709 (patch) | |
| tree | 8d48abfa1c567386a1b0e035f52f767c6ed9f519 /androidprefs/src | |
| parent | 4da15c90a4f3e67182afce7b41d67f9ffbf511f0 (diff) | |
| download | sdk-6990abcbc03c25aeff94da27ed6893e7993d2709.zip sdk-6990abcbc03c25aeff94da27ed6893e7993d2709.tar.gz sdk-6990abcbc03c25aeff94da27ed6893e7993d2709.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'androidprefs/src')
| -rw-r--r-- | androidprefs/src/com/android/prefs/AndroidLocation.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/androidprefs/src/com/android/prefs/AndroidLocation.java b/androidprefs/src/com/android/prefs/AndroidLocation.java index a7ceb76..68a87b7 100644 --- a/androidprefs/src/com/android/prefs/AndroidLocation.java +++ b/androidprefs/src/com/android/prefs/AndroidLocation.java @@ -32,9 +32,9 @@ public final class AndroidLocation { private static final String ANDROID_SDK_VERSION = "SDK-1.0"; /** - * VM folder inside the path returned by {@link #getFolder()} + * Virtual Device folder inside the path returned by {@link #getFolder()} */ - public static final String FOLDER_VMS = "vm"; + public static final String FOLDER_AVD = "avd"; /** * Throw when the location of the android folder couldn't be found. @@ -56,7 +56,7 @@ public final class AndroidLocation { */ public final static String getFolder() throws AndroidLocationException { if (sPrefsLocation == null) { - String home = findValidPath("user.home", "HOME"); + String home = findValidPath("ANDROID_SDK_HOME", "user.home", "HOME"); // if the above failed, we throw an exception. if (home == null) { |