commit dec2604a169426bd0130aef2602fdf8a4306e3bc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 26 23:29:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 26 23:29:25 2019 +0000
tree 587bc902728577358d3096a761f0333f9694a356
parent 193aeda2d139626e44814ef2aa809bf07d83f117
parent 665eb216e53bdd5831584f22ec7a51a809cea0f5

Merge "Fix missing combination check SINK/DEVICE"

services/usb/java/com/android/server/usb/UsbDeviceManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index f1e2281..79e6851 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -842,7 +842,7 @@
                             && status.isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_HOST)
                             && status.isRoleCombinationSupported(POWER_ROLE_SOURCE,
                             DATA_ROLE_DEVICE)
-                            && status.isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_HOST);
+                            && status.isRoleCombinationSupported(POWER_ROLE_SINK, DATA_ROLE_DEVICE);
 
                     args.recycle();
                     updateUsbNotification(false);