diff options
| author | Siva Velusamy <vsiva@google.com> | 2013-01-30 01:45:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-30 01:45:02 +0000 |
| commit | 641afb8bbfa8bc8e980808c22a3e9ecb45008a3c (patch) | |
| tree | 8bfd4e5c444961ccf6138063b56fee137e22b4cd /eclipse/plugins | |
| parent | 317c5ff8d524f9fdf4c63b581213617ae1b61c5b (diff) | |
| parent | 83dcbc78801da59f8bea4adf180183f409be489f (diff) | |
| download | sdk-641afb8bbfa8bc8e980808c22a3e9ecb45008a3c.zip sdk-641afb8bbfa8bc8e980808c22a3e9ecb45008a3c.tar.gz sdk-641afb8bbfa8bc8e980808c22a3e9ecb45008a3c.tar.bz2 | |
Merge "43194: Fix NPE when preferred avd is null"
Diffstat (limited to 'eclipse/plugins')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java | 3 |
1 files changed, 3 insertions, 0 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 31d4d0f..4281f19 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 @@ -377,6 +377,9 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener AvdInfo preferredAvd = null; if (config.mAvdName != null) { preferredAvd = avdManager.getAvd(config.mAvdName, true /*validAvdOnly*/); + } + + if (preferredAvd != null) { IAndroidTarget preferredAvdTarget = preferredAvd.getTarget(); if (preferredAvdTarget != null && !preferredAvdTarget.getVersion().canRun(minApiVersion)) { |