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

Commit 6cfe624e authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Allow any apps to call DPM.isUsbDataSignalingEnabled()" into sc-dev am: b9be2673 

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

Change-Id: I007834e3abb82662d3790fd275a57706b9747139
parents c4797d84 b9be2673

core/java/android/app/admin/DevicePolicyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -13876,8 +13876,7 @@ public class DevicePolicyManager { 
    }















    /**













     * Called by device owner or profile owner of an organization-owned managed profile to return













     * whether USB data signaling is currently enabled by the admin.













     * Returns whether USB data signaling is currently enabled by the admin. Callable by any app.















     *















     * @return {@code true} if USB data signaling is enabled, {@code false} otherwise.















     */

























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



+2
−7






























Original line number
Diff line number
Diff line








@@ -17462,14 +17462,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























    @Override















    public boolean isUsbDataSignalingEnabled(String packageName) {













        final CallerIdentity caller = getCallerIdentity(packageName);













        Preconditions.checkCallAuthorization(













                isDeviceOwner(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller),













                "USB data signaling can only be controlled by a device owner or "













                        + "a profile owner on an organization-owned device.");



























        synchronized (getLockObject()) {













            final ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller);













            final ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(













                    getCallerIdentity(packageName));















            return admin.mUsbDataSignalingEnabled;















        }















    }