Merge "Handle isUsbDataSignalingEnabledForUser PO case" into sc-dev (59536a1e) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}