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

Merge "Get device owner app admin" into tm-dev

Browse Source
This commit is contained in:
Sooraj Sasindran
2022-03-23 17:21:00 +00:00
committed by Android (Google) Code Review
parent 7128e88488 3d14e32aa6
commit 2844eaf9f7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12269,7 +12269,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
+ " only profile owner or device owner may control the preferential" + " only profile owner or device owner may control the preferential"
+ " network service"); + " network service");
synchronized (getLockObject()) { synchronized (getLockObject()) {
final ActiveAdmin requiredAdmin = getProfileOwnerAdminLocked( final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
caller.getUserId()); caller.getUserId());
if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals( if (!requiredAdmin.mPreferentialNetworkServiceConfigs.equals(
preferentialNetworkServiceConfigs)) { preferentialNetworkServiceConfigs)) {
@@ -12299,7 +12299,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
+ " only profile owner or device owner may retrieve the preferential" + " only profile owner or device owner may retrieve the preferential"
+ " network service configurations"); + " network service configurations");
synchronized (getLockObject()) { synchronized (getLockObject()) {
final ActiveAdmin requiredAdmin = getProfileOwnerAdminLocked(caller.getUserId()); final ActiveAdmin requiredAdmin = getDeviceOrProfileOwnerAdminLocked(
caller.getUserId());
return requiredAdmin.mPreferentialNetworkServiceConfigs; return requiredAdmin.mPreferentialNetworkServiceConfigs;
} }
} }