Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29fe0575 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: Iadf81bcf7c1310269f6ef5726dff078454ef75da
parents 10e100c0 e23c8dd1

services/core/java/com/android/server/testharness/TestHarnessModeService.java

+4 −0
Original line number Diff line number Diff line
@@ -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);