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

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

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");