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

Commit 450a5266 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by android-build-merger
Browse files

Merge "Fix missing combination check SINK/DEVICE" am: 25a7e6ed 

am: a890cc7c

Change-Id: I284e113c8f0154032dc54fd3e2053aefa5f78503
parents cfae2075 a890cc7c

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -853,7 +853,7 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver 
                            && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SOURCE,

                            && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SOURCE,

                            UsbPort.DATA_ROLE_DEVICE)

                            UsbPort.DATA_ROLE_DEVICE)

                            && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK,

                            && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK,

                            UsbPort.DATA_ROLE_HOST);

                            UsbPort.DATA_ROLE_DEVICE);





                    args.recycle();

                    args.recycle();

                    updateUsbNotification(false);

                    updateUsbNotification(false);