Merge "Handle isUsbDataSignalingEnabledForUser PO case" into sc-dev

This commit is contained in:
Alex Johnston
2021-02-19 12:22:30 +00:00
committed by Android (Google) Code Review

View File

@@ -16792,7 +16792,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
synchronized (getLockObject()) {
final ActiveAdmin admin = getDeviceOwnerOrProfileOwnerOfOrganizationOwnedDeviceLocked(
UserHandle.USER_SYSTEM);
return admin != null && admin.mUsbDataSignalingEnabled;
return admin == null || admin.mUsbDataSignalingEnabled;
}
}