diff options
3 files changed, 5 insertions, 6 deletions
diff --git a/androidprefs/src/com/android/prefs/AndroidLocation.java b/androidprefs/src/com/android/prefs/AndroidLocation.java index 4936489..9a537d5 100644 --- a/androidprefs/src/com/android/prefs/AndroidLocation.java +++ b/androidprefs/src/com/android/prefs/AndroidLocation.java @@ -52,7 +52,8 @@ 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 environment variable ANDROID_SDK_HOME is set up"); + "Unable to get the Android SDK home directory.\n" + + "Make sure the environment variable ANDROID_SDK_HOME is set up."); } else { sPrefsLocation = home + File.separator + ".android" + File.separator; } diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerPage.java index eb1dccd..b4314cb 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerPage.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/AvdManagerPage.java @@ -60,9 +60,7 @@ public class AvdManagerPage extends Composite implements ISdkListener { "List of existing Android Virtual Devices located at %s",
AvdManager.getBaseAvdFolder()));
} catch (AndroidLocationException e) {
- // We shouldn't be getting here anymore: UpdaterData.initSdk() will
- // no longer complete if the AvdManager failed to be created.
- label.setText("Error: Please define the environment variable ANDROID_SDK_HOME.");
+ label.setText(e.getMessage());
}
mAvdSelector = new AvdSelector(parent,
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index 3d5405c..c14be7e 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -191,7 +191,7 @@ class UpdaterData { "The AVD manager normally uses the user's profile directory to store " +
"AVD files. However it failed to find the default profile directory. " +
"\n" +
- "To fix this please set the environment variable ANDROID_SDK_HOME to " +
+ "To fix this, please set the environment variable ANDROID_SDK_HOME to " +
"a valid path such as \"%s\".",
example));
@@ -211,7 +211,7 @@ class UpdaterData { mAvdManager = null; // remove the old one if needed.
mAvdManager = new AvdManager(mSdkManager, mSdkLog);
} catch (AndroidLocationException e) {
- mSdkLog.error(e, "Unable to read AVDs: " + e.toString()); //$NON-NLS-1$
+ mSdkLog.error(e, "Unable to read AVDs: " + e.getMessage()); //$NON-NLS-1$
// Note: we used to continue here, but the thing is that
// mAvdManager==null so nothing is really going to work as
|