am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair * commit 'be4cbcc2267e3778776c68785b52f871f72c67f7': SDK Manager: fix NPE in AVD > Start when there's no skin name.
This commit is contained in:
@@ -1044,7 +1044,13 @@ public final class AvdManager {
|
||||
}
|
||||
|
||||
if (configIniFile != null) {
|
||||
properties = SdkManager.parsePropertyFile(configIniFile, log);
|
||||
if (!configIniFile.isFile()) {
|
||||
if (log != null) {
|
||||
log.warning("Missing file '%1$s'.", configIniFile.getPath());
|
||||
}
|
||||
} else {
|
||||
properties = SdkManager.parsePropertyFile(configIniFile, log);
|
||||
}
|
||||
}
|
||||
|
||||
// get name
|
||||
|
||||
Reference in New Issue
Block a user