Merge "Merge "Ensure that adbd is stopped explicitly before re-enabling it"...

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;

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