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

Commit 6fdcc66b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 296355cb am: a5958c2c am: 36efe13d am: 35d1fb2a am: 32af8b03

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373419

Change-Id: I7b36db878109464bcdc47201986b852cfd6371ce
parents 07167b8e 32af8b03

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -922,7 +922,7 @@ public class UsbPortManager { 
                    contaminantDetectionStatus);

                    contaminantDetectionStatus);

            mPorts.put(portId, portInfo);

            mPorts.put(portId, portInfo);

        } else {

        } else {

            // Sanity check that ports aren't changing definition out from under us.

            // Validate that ports aren't changing definition out from under us.

            if (supportedModes != portInfo.mUsbPort.getSupportedModes()) {

            if (supportedModes != portInfo.mUsbPort.getSupportedModes()) {

                logAndPrint(Log.WARN, pw, "Ignoring inconsistent list of supported modes from "

                logAndPrint(Log.WARN, pw, "Ignoring inconsistent list of supported modes from "

                        + "USB port driver (should be immutable): "

                        + "USB port driver (should be immutable): "