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

Commit 13b2a506 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I9d990361f15628fb8287ef3efe1ce9f13df480df
parents a10bf2e9 18da7ba0

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

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