diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-07 10:30:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-07 10:30:22 -0700 |
| commit | 36e0ac795e9ec37323e25e0acf04b3090fe4c266 (patch) | |
| tree | 42f651566b86c202f1d26da4a63748d9310093da /tools | |
| parent | 3e44f3b231c027f01290367049f2244514f22d16 (diff) | |
| parent | 5ae5e3da1b96f206e4ce2409df2a81f9537cfa4f (diff) | |
| download | android_development-36e0ac795e9ec37323e25e0acf04b3090fe4c266.tar.gz android_development-36e0ac795e9ec37323e25e0acf04b3090fe4c266.tar.bz2 android_development-36e0ac795e9ec37323e25e0acf04b3090fe4c266.zip | |
Merge change 20389 into donut
* changes:
Fix some display string that contained an unused %s and an NPE
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java index cd2bacb7d..cce65bd88 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java @@ -185,7 +185,7 @@ public class RepoSource implements IDescription { monitor.setDescription("Parse XML");
monitor.incProgress(1);
parsePackages(xml, monitor);
- if (mPackages.length == 0) {
+ if (mPackages == null || mPackages.length == 0) {
mDescription += "\nNo packages found.";
} else if (mPackages.length == 1) {
mDescription += "\nOne package found.";
@@ -370,10 +370,10 @@ public class RepoSource implements IDescription { }
} catch (ParserConfigurationException e) {
- monitor.setResult("Failed to create XML document builder for %1$s");
+ monitor.setResult("Failed to create XML document builder");
} catch (SAXException e) {
- monitor.setResult("Failed to parse XML document %1$s");
+ monitor.setResult("Failed to parse XML document");
} catch (IOException e) {
monitor.setResult("Failed to read XML document");
|