1 files changed, 9 insertions, 1 deletions
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/testing/utp/emulatorcontrol/EmulatorControlConfig.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/testing/utp/emulatorcontrol/EmulatorControlConfig.kt
index 560859c311..3abc425a12 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/testing/utp/emulatorcontrol/EmulatorControlConfig.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/testing/utp/emulatorcontrol/EmulatorControlConfig.kt
@@ -17,6 +17,7 @@
 package com.android.build.gradle.internal.testing.utp
 
 import com.android.build.gradle.internal.dsl.EmulatorControl
+import com.android.build.gradle.options.BooleanOption
 import com.android.build.gradle.options.ProjectOptions
 import java.io.Serializable
 
@@ -28,8 +29,15 @@ data class EmulatorControlConfig(
 fun createEmulatorControlConfig(
     projectOptions: ProjectOptions, emulatorControl: EmulatorControl
 ): EmulatorControlConfig {
+    check(
+        !emulatorControl.enable || projectOptions.get(BooleanOption.ENABLE_EMULATOR_CONTROL)
+    ) {
+        "EmulatorControl is an experimental feature and it is disabled by default. " +
+                "Please add android.experimental.androidTest.enableEmulatorControl=true " +
+                "in your gradle.properties to opt-in to this feature."
+    }
     return EmulatorControlConfig(
-        emulatorControl.enable,
+        emulatorControl.enable && projectOptions.get(BooleanOption.ENABLE_EMULATOR_CONTROL),
         emulatorControl.allowedEndpoints.toSet(),
         emulatorControl.secondsValid
     )