diff options
author | Raphael <raphael@google.com> | 2010-03-25 15:15:53 -0700 |
---|---|---|
committer | Raphael <raphael@google.com> | 2010-03-26 14:07:27 -0700 |
commit | 31dcfe7ab21a0ca71c6c51dba6d41b1d767cf028 (patch) | |
tree | e8a39e6036a305a57cfe1f1f60eaa45208a9bc61 /androidprefs/src | |
parent | 874a96cd7d5e8f371f4495668c04e9a3dcce17ce (diff) | |
download | sdk-31dcfe7ab21a0ca71c6c51dba6d41b1d767cf028.zip sdk-31dcfe7ab21a0ca71c6c51dba6d41b1d767cf028.tar.gz sdk-31dcfe7ab21a0ca71c6c51dba6d41b1d767cf028.tar.bz2 |
SDK Manager: correctly handle lack of AvdManager
Digit's issue in SDK Bug 2535112 was that AndroidLocation failed
to get the SDK home dir; consequently the SdkManager failed to
create an AvdManager and was using a null ptr everywhere.
This CL addresses the core issue here:
- The New AVD button should be grayed if there is AvdManager.
- UpdaterData.initSdk was catching the error and printing an
error log that is not shown in the UI. There's now an explicit
dialog box that explains the error and how to solve it.
- UpdaterWindow now aborts if the above dialog is shown. There's
no need to keep the SDK Manager window around -- OK maybe that's
a bit harsh since the SDK download/install part can stil lbe used
by do we really want to deal with an half-functional window?
No we don't really want that use-case. Let's force the user to
fix it.
- Fixed the AndroidLocation error message to something more usable.
Most people can set an environment variable, however few know
how to "set up the user.home property" (I don't even know how
to do that.)
- Display the AVD base folder in the AVD page.
Change-Id: I2b9dbc7180e4bb3ff696de257bb260e808301d2d
Diffstat (limited to 'androidprefs/src')
-rw-r--r-- | androidprefs/src/com/android/prefs/AndroidLocation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/androidprefs/src/com/android/prefs/AndroidLocation.java b/androidprefs/src/com/android/prefs/AndroidLocation.java index 446c426..4936489 100644 --- a/androidprefs/src/com/android/prefs/AndroidLocation.java +++ b/androidprefs/src/com/android/prefs/AndroidLocation.java @@ -52,7 +52,7 @@ public final class AndroidLocation { // if the above failed, we throw an exception. if (home == null) { throw new AndroidLocationException( - "Unable to get the home directory. Make sure the user.home property is set up"); + "Unable to get the home directory. Make sure the environment variable ANDROID_SDK_HOME is set up"); } else { sPrefsLocation = home + File.separator + ".android" + File.separator; } |