diff --git a/services/core/java/com/android/server/testharness/TestHarnessModeService.java b/services/core/java/com/android/server/testharness/TestHarnessModeService.java index c2ecd41e7dbfd..735a9e41a03bb 100644 --- a/services/core/java/com/android/server/testharness/TestHarnessModeService.java +++ b/services/core/java/com/android/server/testharness/TestHarnessModeService.java @@ -161,6 +161,10 @@ public class TestHarnessModeService extends SystemService { private void configureSettings() { ContentResolver cr = getContext().getContentResolver(); + // Stop ADB before we enable it, otherwise on userdebug/eng builds, the keys won't have + // registered with adbd, and it will prompt the user to confirm the keys. + Settings.Global.putInt(cr, Settings.Global.ADB_ENABLED, 0); + // Disable the TTL for ADB keys before enabling ADB Settings.Global.putLong(cr, Settings.Global.ADB_ALLOWED_CONNECTION_TIME, 0); Settings.Global.putInt(cr, Settings.Global.ADB_ENABLED, 1);