Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3

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

Change-Id: Ia10debc21d4d65e2e7b7b9e16ab96956a56426c9
This commit is contained in:
Treehugger Robot
2020-07-28 16:30:12 +00:00
committed by Automerger Merge Worker
parent 80a5722b9b 296355cba3
commit a5958c2cba
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/usb/java/com/android/server/usb/UsbPortManager.java
View File

@@ -921,7 +921,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): "