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

Merge "Overcome disconnect during oem override"

Browse Source
This commit is contained in:
Badhri Jagan Sridharan
2018-01-11 17:53:11 +00:00
committed by Gerrit Code Review
parent 08498c32f4 65a6237243
commit 5e093d997a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -434,6 +434,8 @@ public class UsbDeviceManager {
try {
// Restore default functions.
mCurrentOemFunctions = SystemProperties.get(UsbDeviceManager.getPersistProp(false),
UsbManager.USB_FUNCTION_NONE);
if (isNormalBoot()) {
mCurrentFunctions = SystemProperties.get(USB_CONFIG_PROPERTY,
UsbManager.USB_FUNCTION_NONE);
@@ -662,8 +664,7 @@ public class UsbDeviceManager {
}
if ((!functions.equals(oemFunctions) &&
(mCurrentOemFunctions == null ||
!mCurrentOemFunctions.equals(oemFunctions)))
!mCurrentOemFunctions.equals(oemFunctions))
|| !mCurrentFunctions.equals(functions)
|| !mCurrentFunctionsApplied
|| forceRestart) {