diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-08-18 11:54:31 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-08-20 10:32:44 -0700 |
| commit | 0ea567555622b780e29aeb297c571abeee463636 (patch) | |
| tree | 8143eaa3b3d087588989ea201b79c4c98c786ef7 | |
| parent | 7327c9ef33e128e57f181b543b9b6ce750ddc7c8 (diff) | |
| download | sdk-0ea567555622b780e29aeb297c571abeee463636.zip sdk-0ea567555622b780e29aeb297c571abeee463636.tar.gz sdk-0ea567555622b780e29aeb297c571abeee463636.tar.bz2 | |
Merge sdklib manifest fix for r7. DO NOT MERGE.
Original commit msg:
Fix missing dependency in the sdklib manifest + improved error reporting.
Change-Id: I778a839cc280db8bcc7a4a0b11378119de9aed57
| -rw-r--r-- | sdkmanager/libs/sdklib/manifest.txt | 2 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sdkmanager/libs/sdklib/manifest.txt b/sdkmanager/libs/sdklib/manifest.txt index 8f2b7f7..3f6cd85 100644 --- a/sdkmanager/libs/sdklib/manifest.txt +++ b/sdkmanager/libs/sdklib/manifest.txt @@ -1 +1 @@ -Class-Path: androidprefs.jar +Class-Path: androidprefs.jar commons-compress-1.0.jar 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 a45896f..fdba9c8 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 @@ -458,19 +458,22 @@ class UpdaterData { // Display anything unexpected in the monitor.
String msg = t.getMessage();
if (msg != null) {
- monitor.setResult("Unexpected Error installing '%1$s': %2$s",
- archive.getParentPackage().getShortDescription(), msg);
+ msg = String.format("Unexpected Error installing '%1$s': %2$s: %3$s",
+ archive.getParentPackage().getShortDescription(),
+ t.getClass().getCanonicalName(), msg);
} else {
// no error info? get the stack call to display it
// At least that'll give us a better bug report.
ByteArrayOutputStream baos = new ByteArrayOutputStream();
t.printStackTrace(new PrintStream(baos));
- // and display it
- monitor.setResult("Unexpected Error installing '%1$s'\n%2$s",
+ msg = String.format("Unexpected Error installing '%1$s'\n%2$s",
archive.getParentPackage().getShortDescription(),
baos.toString());
}
+
+ monitor.setResult(msg);
+ mSdkLog.error(t, msg);
} finally {
// Always move the progress bar to the desired position.
|