Merge "Ensure ADB is stopped when enabling Test Harness Mode" into rvc-dev am: e23c8dd158 am: 895775b173

Change-Id: I0c8bbbd78fef4cd748788eeee0609cc13b25dbeb

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);