diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-19 23:07:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-19 23:07:19 +0000 |
| commit | 4471500ebe9eb59c4d9488f61297fc73daf48c8b (patch) | |
| tree | 7df16a68b057b0acb9d96a26ea2e94b57ad8fce3 /services/usb | |
| parent | 35ce823dff34370b5815dc1526ccbd80f3e4ab97 (diff) | |
| parent | 21e272d52e629b8c9497abecccd62869c55319da (diff) | |
Merge "Add AdbTransportType.aidl. Add AdbWifi internal API stubs." am: c5cb13899d am: 44cf122df0 am: 21e272d52e
Change-Id: Ic09de8f7f6a064ccfa11654f7a5833b1ebfa490a
Diffstat (limited to 'services/usb')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 6407ec76958e..84f411f33157 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -41,6 +41,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Resources; import android.debug.AdbManagerInternal; +import android.debug.AdbTransportType; import android.debug.IAdbTransport; import android.hardware.usb.ParcelableUsbPort; import android.hardware.usb.UsbAccessory; @@ -775,8 +776,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser } @Override - public void onAdbEnabled(boolean enabled) { - mHandler.sendMessage(MSG_ENABLE_ADB, enabled); + public void onAdbEnabled(boolean enabled, byte transportType) { + if (transportType == AdbTransportType.USB) { + mHandler.sendMessage(MSG_ENABLE_ADB, enabled); + } } } @@ -1170,7 +1173,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser } protected boolean isAdbEnabled() { - return LocalServices.getService(AdbManagerInternal.class).isAdbEnabled(); + return LocalServices.getService(AdbManagerInternal.class) + .isAdbEnabled(AdbTransportType.USB); } protected void updateAdbNotification(boolean force) { |