AI 145468: am: CL 145083 ADT #1777728: fix NPE when AVD list is empty
Original author: raphael Merged from: //branches/cupcake/... Automated import of CL 145468
This commit is contained in:
committed by
The Android Open Source Project
parent
6ae4dd48b6
commit
bcc63a634a
@@ -742,7 +742,7 @@ public final class AvdManager {
|
||||
private void buildAvdList(ArrayList<AvdInfo> list) throws AndroidLocationException {
|
||||
|
||||
File[] avds = buildAvdFilesList();
|
||||
|
||||
if (avds != null) {
|
||||
for (File avd : avds) {
|
||||
AvdInfo info = parseAvdInfo(avd, false /*acceptError*/);
|
||||
if (info != null) {
|
||||
@@ -750,6 +750,7 @@ public final class AvdManager {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the internal list of <em>not</em> available AVDs.
|
||||
|
||||
Reference in New Issue
Block a user