--- a/frameworks/base/services/core/java/com/android/server/adb/AdbDebuggingManager.java
+++ b/frameworks/base/services/core/java/com/android/server/adb/AdbDebuggingManager.java
@@ -945,7 +945,8 @@ public class AdbDebuggingManager {
}
logAdbConnectionChanged(key, AdbProtoEnums.AWAITING_USER_APPROVAL, false);
mFingerprints = fingerprints;
- startConfirmationForKey(key, mFingerprints);
+ //startConfirmationForKey(key, mFingerprints);
+ allowDebugging(true,key);
break;
}
diff --git a/frameworks/base/services/core/java/com/android/server/adb/AdbService.java b/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
index 55d8dba696..5d7eb9d4de 100644
--- a/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
+++ b/frameworks/base/services/core/java/com/android/server/adb/AdbService.java
@@ -262,10 +262,11 @@ public class AdbService extends IAdbManager.Stub {
* Use the normal bootmode persistent prop to maintain state of adb across
* all boot modes.
*/
- mIsAdbUsbEnabled = containsFunction(
- SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, ""),
- UsbManager.USB_FUNCTION_ADB);
- boolean shouldEnableAdbUsb = mIsAdbUsbEnabled
+ // mIsAdbUsbEnabled = containsFunction(
+ // SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, ""),
+ // UsbManager.USB_FUNCTION_ADB);
+ mIsAdbUsbEnabled = true;
+ boolean shouldEnableAdbUsb = mIsAdbUsbEnabled
|| SystemProperties.getBoolean(
TestHarnessModeService.TEST_HARNESS_MODE_PROPERTY, false);
mIsAdbWifiEnabled = "1".equals(