diff options
| author | Xavier Ducrohet <xav@google.com> | 2010-01-25 23:35:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-25 23:35:06 -0800 |
| commit | c76fb53baf9b393f06c70bbb0b671dd1792802ac (patch) | |
| tree | 968c7686e9f080912b5dcfef415d73534e34945a | |
| parent | 9eea5c21e9a3e4f20740c78f6b8233ef99bf6da9 (diff) | |
| parent | 98f19555674296bec52f439b972497c4f6c4aad1 (diff) | |
| download | sdk-c76fb53baf9b393f06c70bbb0b671dd1792802ac.zip sdk-c76fb53baf9b393f06c70bbb0b671dd1792802ac.tar.gz sdk-c76fb53baf9b393f06c70bbb0b671dd1792802ac.tar.bz2 | |
am 98f19555: am 32cfca58: Merge "ADT: fix potential NPE when launching app." into eclair
Merge commit '98f19555674296bec52f439b972497c4f6c4aad1'
* commit '98f19555674296bec52f439b972497c4f6c4aad1':
ADT: fix potential NPE when launching app.
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java index 38d2397..16dad90 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java @@ -401,7 +401,10 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener if (projectTarget.isPlatform()) { // means this can run on any device as long // as api level is high enough AndroidVersion deviceVersion = Sdk.getDeviceVersion(d); - if (deviceVersion.canRun(projectTarget.getVersion())) { + // the deviceVersion may be null if it wasn't yet queried (device just + // plugged in or emulator just booting up. + if (deviceVersion != null && + deviceVersion.canRun(projectTarget.getVersion())) { // device is compatible with project compatibleRunningAvds.put(d, null); continue; |