diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-22 15:30:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-22 15:30:26 +0000 |
| commit | b42dfed0f4b1a3e3e933af8b140c0c842d05cd3b (patch) | |
| tree | 7d6b354b09edf460a2b222f036692ad9105f9c83 /services/usb/java | |
| parent | 00f848a92273ea9480a6676ca74d6f11aa56053f (diff) | |
| parent | b9f266d97c8e099389e088552fd4428c92509fc1 (diff) | |
Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c
Change-Id: Id8571a8db96770cd699a71c5fcb50fb58c8e511b
Diffstat (limited to 'services/usb/java')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 5bb75c92fd30..d2b30b2ff5ef 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -1718,21 +1718,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser private static final int ENUMERATION_TIME_OUT_MS = 2000; /** - * Command to start native service. - */ - protected static final String CTL_START = "ctl.start"; - - /** - * Command to start native service. - */ - protected static final String CTL_STOP = "ctl.stop"; - - /** - * Adb native daemon. - */ - protected static final String ADBD = "adbd"; - - /** * Gadget HAL fully qualified instance name for registering for ServiceNotification. */ protected static final String GADGET_HAL_FQ_NAME = @@ -1913,17 +1898,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser return; } try { - if ((config & UsbManager.FUNCTION_ADB) != 0) { - /** - * Start adbd if ADB function is included in the configuration. - */ - setSystemProperty(CTL_START, ADBD); - } else { - /** - * Stop adbd otherwise. - */ - setSystemProperty(CTL_STOP, ADBD); - } + // Adbd will be started by AdbService once Global.ADB_ENABLED is set. UsbGadgetCallback usbGadgetCallback = new UsbGadgetCallback(mCurrentRequest, config, chargingFunctions); mGadgetProxy.setCurrentUsbFunctions(config, usbGadgetCallback, |