Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a0a27c authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Handle isUsbDataSignalingEnabledForUser PO case" into sc-dev am: 59536a1e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13607754

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2493706d54b4b552c978ec9beff208340e1ffa24
parents f71c55a9 59536a1e

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

+1 −1
Original line number Diff line number Diff line
@@ -16795,7 +16795,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;

        }

    }