diff options
| author | Joe Baker-Malone <jbakermalone@google.com> | 2015-01-02 20:13:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-02 20:13:52 +0000 |
| commit | 6d9861b0a70ad8a70ffaf00ab8642764b1a433c3 (patch) | |
| tree | d79abf858774f6ba9d8bb0b7b37a8e21c1dfba75 | |
| parent | 11a141ff164f58c2e1f8ae1e62c3dfff190efbf4 (diff) | |
| parent | 65770eebfc1a1966745228286c5b0de94c96c185 (diff) | |
| download | platform_tools_swt-studio-1.2-dev.tar.gz platform_tools_swt-studio-1.2-dev.tar.bz2 platform_tools_swt-studio-1.2-dev.zip | |
Merge "Fixing breakage caused by 121088" into studio-1.1-devgradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0studio-1.2-releasestudio-1.2-devstudio-1.1-releasestudio-1.1-dev
| -rw-r--r-- | sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdSelector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdSelector.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdSelector.java index 94ceaa8..3d9c4e2 100644 --- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdSelector.java +++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdSelector.java @@ -971,7 +971,7 @@ public final class AvdSelector { final Display display = mTable.getDisplay(); // check if the AVD is running - if (avdInfo.isRunning()) { + if (mAvdManager.isAvdRunning(avdInfo)) { display.asyncExec(new Runnable() { @Override public void run() { |