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

UsbPortManager: Re-enable contaminant detection when port is unplugged

Browse Source 
SystemUI disables contaminant detection when user wants to continue
using the port. Re-enable contaminant detection when the accessory
is unplugged.

Bug: 128534822
Test: Tested with the mock circuit.
Change-Id: I22a3c839264876409c68c6a3145c9fcc6278f381
This commit is contained in:
Badhri Jagan Sridharan
2019-03-14 15:26:19 -07:00
parent 26c490c568
commit 3df511319c
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -965,6 +965,7 @@ public class UsbPortManager {
private void handlePortLocked(PortInfo portInfo, IndentingPrintWriter pw) {
sendPortChangedBroadcastLocked(portInfo);
enableContaminantDetectionIfNeeded(portInfo, pw);
logToStatsd(portInfo, pw);
updateContaminantNotification();
}
@@ -1016,6 +1017,22 @@ public class UsbPortManager {
Manifest.permission.MANAGE_USB));
}
private void enableContaminantDetectionIfNeeded(PortInfo portInfo, IndentingPrintWriter pw) {
if (!mConnected.containsKey(portInfo.mUsbPort.getId())) {
return;
}
if (mConnected.get(portInfo.mUsbPort.getId())
&& !portInfo.mUsbPortStatus.isConnected()
&& portInfo.mUsbPortStatus.getContaminantDetectionStatus()
== UsbPortStatus.CONTAMINANT_DETECTION_DISABLED) {
// Contaminant detection might have been temporarily disabled by the user
// through SystemUI.
// Re-enable contaminant detection when the accessory is unplugged.
enableContaminantDetection(portInfo.mUsbPort.getId(), true, pw);
}
}
private void logToStatsd(PortInfo portInfo, IndentingPrintWriter pw) {
// Port is removed
if (portInfo.mUsbPortStatus == null) {
@@ -1052,12 +1069,6 @@ public class UsbPortManager {
? StatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_CONNECTED :
StatsLog.USB_CONNECTOR_STATE_CHANGED__STATE__STATE_DISCONNECTED,
portInfo.mUsbPort.getId(), portInfo.mLastConnectDurationMillis);
// Contaminant detection might have been temporarily disabled by the user
// through SystemUI.
// Re-enable contaminant detection when the accessory is unplugged.
if (!portInfo.mUsbPortStatus.isConnected()) {
enableContaminantDetection(portInfo.mUsbPort.getId(), true, pw);
}
}
if (!mContaminantStatus.containsKey(portInfo.mUsbPort.getId())