Fix some display string that contained an unused %s and an NPE

This makes the android app crash when the XML cannot be validated.

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 cd2bacb..cce65bd 100755 (executable)
--- 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");\r
             monitor.incProgress(1);\r
             parsePackages(xml, monitor);\r
-            if (mPackages.length == 0) {\r
+            if (mPackages == null || mPackages.length == 0) {\r
                 mDescription += "\nNo packages found.";\r
             } else if (mPackages.length == 1) {\r
                 mDescription += "\nOne package found.";\r
@@ -370,10 +370,10 @@ public class RepoSource implements IDescription {
             }\r
 \r
         } catch (ParserConfigurationException e) {\r
-            monitor.setResult("Failed to create XML document builder for %1$s");\r
+            monitor.setResult("Failed to create XML document builder");\r
 \r
         } catch (SAXException e) {\r
-            monitor.setResult("Failed to parse XML document %1$s");\r
+            monitor.setResult("Failed to parse XML document");\r
 \r
         } catch (IOException e) {\r
             monitor.setResult("Failed to read XML document");\r