Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr1-dev
* changes: [automerger] Permission Check For DPM.getPermittedAccessibilityServices am:4fd13eefcfam:39eef269be[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:4fd13eefcfPermission Check For DPM.getPermittedAccessibilityServices
This commit is contained in:
committed by
Android (Google) Code Review
commit
3f1d0ccd2d
@@ -7014,6 +7014,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
|
||||
if (!mHasFeature) {
|
||||
return null;
|
||||
}
|
||||
enforceManageUsers();
|
||||
synchronized (this) {
|
||||
List<String> result = null;
|
||||
// If we have multiple profiles we return the intersection of the
|
||||
|
||||
Reference in New Issue
Block a user