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

Merge "Update USB HAL version early" into sc-dev

Browse Source
This commit is contained in:
Albert Wang
2021-07-12 13:02:00 +00:00
committed by Android (Google) Code Review
parent 01feaca6e2 810915add5
commit 039b7ccc83
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -17557,9 +17557,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
final boolean usbEnabled;
synchronized (getLockObject()) {
final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(
UserHandle.USER_SYSTEM);
usbEnabled = admin != null && admin.mUsbDataSignalingEnabled;
usbEnabled = isUsbDataSignalingEnabledInternalLocked();
}
if (!mInjector.binderWithCleanCallingIdentity(
() -> mInjector.getUsbManager().enableUsbDataSignal(usbEnabled))) {

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

@@ -385,29 +385,16 @@ public class UsbPortManager {
* @param none
*/
private void updateUsbHalVersion() {
android.hardware.usb.V1_3.IUsb usbProxy_V1_3 =
android.hardware.usb.V1_3.IUsb.castFrom(mProxy);
if (usbProxy_V1_3 != null) {
if (android.hardware.usb.V1_3.IUsb.castFrom(mProxy) != null) {
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_3;
return;
}
android.hardware.usb.V1_2.IUsb usbProxy_V1_2 =
android.hardware.usb.V1_2.IUsb.castFrom(mProxy);
if (usbProxy_V1_2 != null) {
} else if (android.hardware.usb.V1_2.IUsb.castFrom(mProxy) != null) {
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_2;
return;
}
android.hardware.usb.V1_1.IUsb usbProxy_V1_1 =
android.hardware.usb.V1_1.IUsb.castFrom(mProxy);
if (usbProxy_V1_1 != null) {
} else if (android.hardware.usb.V1_1.IUsb.castFrom(mProxy) != null) {
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_1;
return;
} else {
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_0;
}
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_0;
return;
logAndPrint(Log.INFO, null, "USB HAL version: " + mCurrentUsbHalVersion);
}
public void setPortRoles(String portId, int newPowerRole, int newDataRole,
@@ -850,7 +837,7 @@ public class UsbPortManager {
mProxy.linkToDeath(new DeathRecipient(pw), USB_HAL_DEATH_COOKIE);
mProxy.setCallback(mHALCallback);
mProxy.queryPortStatus();
mCurrentUsbHalVersion = UsbManager.USB_HAL_V1_0;
updateUsbHalVersion();
} catch (NoSuchElementException e) {
logAndPrintException(pw, "connectToProxy: usb hal service not found."
+ " Did the service fail to start?", e);
@@ -1183,7 +1170,6 @@ public class UsbPortManager {
case MSG_SYSTEM_READY: {
mNotificationManager = (NotificationManager)
mContext.getSystemService(Context.NOTIFICATION_SERVICE);
updateUsbHalVersion();
break;
}
}