diff options
| author | Siva Velusamy <vsiva@google.com> | 2015-04-24 17:11:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 17:11:46 +0000 |
| commit | 8a4fcc821a05063b0227682e414af8ddcf1aa1fd (patch) | |
| tree | ba21e37793994155579fef2848b2dff1630b77d2 /android/src | |
| parent | 8bac59857630223cec747f82ddfa96cd3c5cf803 (diff) | |
| parent | 80b4d7731128742b7049b6053c4e3ab681517e69 (diff) | |
| download | idea-8a4fcc821a05063b0227682e414af8ddcf1aa1fd.tar.gz | |
am 80b4d773: am bd0f2f7a: Merge "Check against debug executor in Android runner." into studio-1.3-dev automerge: 07503f7 automerge: a216cf0
* commit '80b4d7731128742b7049b6053c4e3ab681517e69':
Check against debug executor in Android runner.
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/org/jetbrains/android/run/AndroidDebugRunner.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/src/org/jetbrains/android/run/AndroidDebugRunner.java b/android/src/org/jetbrains/android/run/AndroidDebugRunner.java index 9fc08b0f088..024c5eb3708 100644 --- a/android/src/org/jetbrains/android/run/AndroidDebugRunner.java +++ b/android/src/org/jetbrains/android/run/AndroidDebugRunner.java @@ -123,7 +123,7 @@ public class AndroidDebugRunner extends DefaultProgramRunner { } private RunContentDescriptor doExec(AndroidRunningState state, ExecutionEnvironment environment) throws ExecutionException { - if (DefaultRunExecutor.EXECUTOR_ID.equals(environment.getExecutor().getId())) { + if (!(environment.getExecutor() instanceof DefaultDebugExecutor)) { final RunContentDescriptor descriptor = super.doExecute(state, environment); if (descriptor != null) { |