From ac294d7ce361c2fdc68bc2ea7cb4f6c99ba10562 Mon Sep 17 00:00:00 2001
From: Badhri Jagan Sridharan <badhri@google.com>
Date: Mon, 25 Mar 2019 11:02:44 -0700
Subject: [PATCH] Fix missing combination check SINK/DEVICE

While checking for possible role combinations, the SINK/HOST combination
seems to be mistakenly checked twice intead of SINK/DEVICE.
This CL fixes this. The code now checks for:
1. source & host
2. sink & host
3. source & device
4. sink & device

Bug: 119142682
Change-Id: I5e652fbf9313bd2c122fe728d58e577085632253
Merged-In: I5e652fbf9313bd2c122fe728d58e577085632253
---
 services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index da682c6df621a..e949e74902302 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -855,7 +855,7 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver
                             && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SOURCE,
                             UsbPort.DATA_ROLE_DEVICE)
                             && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK,
-                            UsbPort.DATA_ROLE_HOST);
+                            UsbPort.DATA_ROLE_DEVICE);
 
                     args.recycle();
                     updateUsbNotification(false);