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

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

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

Change-Id: I68969e2b7b7131dd35474d2f4a9dae4164d8461a
This commit is contained in:
Rubin Xu
2021-06-09 16:15:20 +00:00
committed by Automerger Merge Worker
parent ffc0594d54 b9be267361
commit 3221b1b8d2
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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.
*/

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

@@ -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;
}
}