Merge cherrypicks of [12991758] into studio-4.1-release Change-Id: Icb5c45bf87fb1fe18d52a3a89e981f304eed7e26
diff --git a/android/src/com/android/tools/idea/avdmanager/AvdManagerConnection.java b/android/src/com/android/tools/idea/avdmanager/AvdManagerConnection.java index 1705033..8c0ccbf 100644 --- a/android/src/com/android/tools/idea/avdmanager/AvdManagerConnection.java +++ b/android/src/com/android/tools/idea/avdmanager/AvdManagerConnection.java
@@ -636,7 +636,7 @@ commandLine.addParameters("-avd", info.getName()); if (shouldBeLaunchedEmbedded(project, info)) { - commandLine.addParameters("-no-window", "-gpu", "auto-no-window", "-grpc-use-token", "-idle-grpc-timeout", "300"); // Launch headless. + commandLine.addParameters("-qt-hide-window", "-grpc-use-token", "-idle-grpc-timeout", "300"); // Launch headless. } }
diff --git a/android/src/com/android/tools/idea/avdmanager/EmulatorRunner.java b/android/src/com/android/tools/idea/avdmanager/EmulatorRunner.java index 64cbd12..e903dcc 100644 --- a/android/src/com/android/tools/idea/avdmanager/EmulatorRunner.java +++ b/android/src/com/android/tools/idea/avdmanager/EmulatorRunner.java
@@ -83,7 +83,7 @@ @NotNull private static LaunchType getLaunchType(@NotNull GeneralCommandLine commandLine) { - return commandLine.getParametersList().getParameters().contains("-no-window") ? LaunchType.IN_TOOL_WINDOW : LaunchType.STANDALONE; + return commandLine.getParametersList().getParameters().contains("-qt-hide-window") ? LaunchType.IN_TOOL_WINDOW : LaunchType.STANDALONE; } @NotNull
diff --git a/emulator/src/com/android/tools/idea/emulator/EmulatorId.kt b/emulator/src/com/android/tools/idea/emulator/EmulatorId.kt index fe5975f..b157899 100644 --- a/emulator/src/com/android/tools/idea/emulator/EmulatorId.kt +++ b/emulator/src/com/android/tools/idea/emulator/EmulatorId.kt
@@ -30,5 +30,5 @@ } val isEmbedded: Boolean - get() = commandLine.contains("auto-no-window") + get() = commandLine.contains("-qt-hide-window") } \ No newline at end of file
diff --git a/emulator/src/com/android/tools/idea/emulator/EmulatorToolWindowManager.kt b/emulator/src/com/android/tools/idea/emulator/EmulatorToolWindowManager.kt index 5ec2249..a8b2cbf 100644 --- a/emulator/src/com/android/tools/idea/emulator/EmulatorToolWindowManager.kt +++ b/emulator/src/com/android/tools/idea/emulator/EmulatorToolWindowManager.kt
@@ -451,6 +451,6 @@ @JvmStatic private fun isEmbeddedEmulator(commandLine: GeneralCommandLine) = - commandLine.parametersList.parameters.contains("-no-window") + commandLine.parametersList.parameters.contains("-qt-hide-window") } }
diff --git a/emulator/testSrc/com/android/tools/idea/emulator/EmulatorToolWindowManagerTest.kt b/emulator/testSrc/com/android/tools/idea/emulator/EmulatorToolWindowManagerTest.kt index 58cdf8f..abb1e10 100644 --- a/emulator/testSrc/com/android/tools/idea/emulator/EmulatorToolWindowManagerTest.kt +++ b/emulator/testSrc/com/android/tools/idea/emulator/EmulatorToolWindowManagerTest.kt
@@ -95,7 +95,7 @@ // Send notification that the emulator has been launched. val avdInfo = AvdInfo(emulator1.avdId, emulator1.avdFolder.resolve("config.ini").toFile(), emulator1.avdFolder.toString(), mock(), null) - val commandLine = GeneralCommandLine("/emulator_home/fake_emulator", "-avd", emulator1.avdId, "-no-window", "-gpu", "auto-no-window") + val commandLine = GeneralCommandLine("/emulator_home/fake_emulator", "-avd", emulator1.avdId, "-qt-hide-window") project.messageBus.syncPublisher(AvdLaunchListener.TOPIC).avdLaunched(avdInfo, commandLine, project) dispatchAllInvocationEvents()
diff --git a/emulator/testSrc/com/android/tools/idea/emulator/FakeEmulator.kt b/emulator/testSrc/com/android/tools/idea/emulator/FakeEmulator.kt index 6159325..61c4825 100644 --- a/emulator/testSrc/com/android/tools/idea/emulator/FakeEmulator.kt +++ b/emulator/testSrc/com/android/tools/idea/emulator/FakeEmulator.kt
@@ -120,11 +120,7 @@ val grpcCallLog = LinkedBlockingDeque<GrpcCallRecord>() init { - val embeddedFlags = if (standalone) { - "" - } else { - """ "-no-window" "-gpu" "auto-no-window"""" - } + val embeddedFlags = if (standalone) "" else """ "-qt-hide-window"""" registration = """ port.serial=${serialPort}
diff --git a/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/emulator/AvdTestRule.kt b/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/emulator/AvdTestRule.kt index 802e0d0..40525e5 100644 --- a/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/emulator/AvdTestRule.kt +++ b/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/emulator/AvdTestRule.kt
@@ -243,7 +243,7 @@ private fun startAvd(emulatorBinary: File, avdInfo: AvdInfo): Process { val pb = ProcessBuilder() - pb.command(listOf(emulatorBinary.absolutePath, "-no-window", "-avd", avdInfo.name)) + pb.command(listOf(emulatorBinary.absolutePath, "-qt-hide-window", "-avd", avdInfo.name)) val env = pb.environment() env["HOME"] = AndroidLocation.getUserHomeFolder() env["ANDROID_AVD_HOME"] = AndroidLocation.getAvdFolder()
diff --git a/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/fixture/avdmanager/MockAvdManagerConnection.java b/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/fixture/avdmanager/MockAvdManagerConnection.java index 66f8968..1d72711 100755 --- a/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/fixture/avdmanager/MockAvdManagerConnection.java +++ b/uitest-framework/testSrc/com/android/tools/idea/tests/gui/framework/fixture/avdmanager/MockAvdManagerConnection.java
@@ -64,7 +64,7 @@ boolean forceColdBoot, @NotNull GeneralCommandLine commandLine) { super.addParameters(project, info, forceColdBoot, commandLine); - commandLine.addParameters("-no-window"); + commandLine.addParameters("-qt-hide-window"); } @NotNull