Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iadf81bcf7c1310269f6ef5726dff078454ef75da
This commit is contained in:
TreeHugger Robot
2020-04-17 03:54:27 +00:00
committed by Automerger Merge Worker
parent 10e100c03d e23c8dd158
commit 29fe05751e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/testharness/TestHarnessModeService.java
View File

@@ -161,6 +161,10 @@ public class TestHarnessModeService extends SystemService {
private void configureSettings() { private void configureSettings() {
ContentResolver cr = getContext().getContentResolver(); 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 // Disable the TTL for ADB keys before enabling ADB
Settings.Global.putLong(cr, Settings.Global.ADB_ALLOWED_CONNECTION_TIME, 0); Settings.Global.putLong(cr, Settings.Global.ADB_ALLOWED_CONNECTION_TIME, 0);
Settings.Global.putInt(cr, Settings.Global.ADB_ENABLED, 1); Settings.Global.putInt(cr, Settings.Global.ADB_ENABLED, 1);