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

Merge change I6dbcafab into eclair

Browse Source 
* changes:
  Fix NPE in the parsing of property file.
This commit is contained in:
Android (Google) Code Review
2009-10-13 14:41:47 -04:00
parent 96fc3df693 73ecae2fdc
commit bc7c36728c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
View File

@@ -605,8 +605,10 @@ public final class SdkManager {
if (m.matches()) {
map.put(m.group(1), m.group(2));
} else {
log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax",
buildProp.getAbsolutePath(), line);
if (log != null) {
log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax",
buildProp.getAbsolutePath(), line);
}
return null;
}
}