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 am: a5958c2cba am: 36efe13de9

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

Change-Id: I1f4becb31d39e151e64fc18ab420c23a6682eed7
This commit is contained in:
Treehugger Robot
2020-07-28 16:58:22 +00:00
committed by Automerger Merge Worker
parent ba1245d651 36efe13de9
commit 35d1fb2ad2
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

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