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

AI 145468: am: CL 145083 ADT #1777728: fix NPE when AVD list is empty

Browse Source 
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 145468
This commit is contained in:
Raphael Moll
2009-04-09 14:10:03 -07:00
committed by The Android Open Source Project
parent 6ae4dd48b6
commit bcc63a634a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
View File

@@ -742,11 +742,12 @@ public final class AvdManager {
private void buildAvdList(ArrayList<AvdInfo> list) throws AndroidLocationException {
File[] avds = buildAvdFilesList();
for (File avd : avds) {
AvdInfo info = parseAvdInfo(avd, false /*acceptError*/);
if (info != null) {
list.add(info);
if (avds != null) {
for (File avd : avds) {
AvdInfo info = parseAvdInfo(avd, false /*acceptError*/);
if (info != null) {
list.add(info);
}
}
}
}