From 90de7d27984b8a71f48e35914ab0d8de2dca8ffa Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Fri, 4 Mar 2011 11:34:14 -0800 Subject: [PATCH] Fix NPE in SdkManager: parsed props can be null. Change-Id: Ia1b873fc48e87173148572b123d3c0346542f4d9 --- .../libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java index 116fa4a9c..fefe89140 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java @@ -1402,7 +1402,7 @@ public final class AvdManager { } // get abi type - String abiType = properties.get(AVD_INI_ABI_TYPE); + String abiType = properties == null ? null : properties.get(AVD_INI_ABI_TYPE); // for the avds created previously without enhancement, i.e. They are created based // on previous API Levels. They are supposed to have ARM processor type if (abiType == null) { -- 2.11.0