LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 36e0ac79: Merge change 20389 into donut

Browse Source 
Merge commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266'

* commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266':
  Fix some display string that contained an unused %s and an NPE
This commit is contained in:
Xavier Ducrohet
2009-08-07 10:31:59 -07:00
committed by Android Git Automerger
parent 0d7ed15a85 36e0ac795e
commit f20c485b17
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java
View File

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