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

Merge "Ensure that adbd is stopped explicitly before re-enabling it" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-23 22:59:36 +00:00
committed by Android (Google) Code Review
parent a721ccdc7c 482900c14a
commit 18da7ba0cf
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
import android.debug.AdbManagerInternal;
import android.debug.AdbTransportType;
import android.location.LocationManager;
import android.os.BatteryManager;
import android.os.Binder;
@@ -164,6 +165,10 @@ public class TestHarnessModeService extends SystemService {
// 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);
AdbManagerInternal adbManager = LocalServices.getService(AdbManagerInternal.class);
if (adbManager.isAdbEnabled(AdbTransportType.USB)) {
adbManager.stopAdbdForTransport(AdbTransportType.USB);
}
// Disable the TTL for ADB keys before enabling ADB
Settings.Global.putLong(cr, Settings.Global.ADB_ALLOWED_CONNECTION_TIME, 0);