Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9 am: 35d1fb2ad2 am: 32af8b03ee

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

Change-Id: I7b36db878109464bcdc47201986b852cfd6371ce
This commit is contained in:
Treehugger Robot
2020-07-28 17:19:59 +00:00
committed by Automerger Merge Worker

View File

@@ -922,7 +922,7 @@ public class UsbPortManager {
contaminantDetectionStatus);
mPorts.put(portId, portInfo);
} 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()) {
logAndPrint(Log.WARN, pw, "Ignoring inconsistent list of supported modes from "
+ "USB port driver (should be immutable): "