diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-08-07 10:31:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-07 10:31:59 -0700 |
| commit | f20c485b17bc1ae7100cac21fa658ce396758ab4 (patch) | |
| tree | 11d1689c6b1a1e326b01f57292e094d8311c834f /tools | |
| parent | 0d7ed15a85b16a8fa922249a4500240fe7bd2c68 (diff) | |
| parent | 36e0ac795e9ec37323e25e0acf04b3090fe4c266 (diff) | |
| download | android_development-f20c485b17bc1ae7100cac21fa658ce396758ab4.tar.gz android_development-f20c485b17bc1ae7100cac21fa658ce396758ab4.tar.bz2 android_development-f20c485b17bc1ae7100cac21fa658ce396758ab4.zip | |
am 36e0ac79: Merge change 20389 into donut
Merge commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266'
* commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266':
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");
|