Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 665eb216 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

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

Cherrypicked from aosp:
https://android-review.googlesource.com/c/platform/frameworks/base/+/933377

Bug: 119142682
Test: Build success
Change-Id: I5e652fbf9313bd2c122fe728d58e577085632253
parent 2b16489c

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

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser 
                            && 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);