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

Merge "Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7"

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-03-24 00:41:48 +00:00
committed by Android (Google) Code Review
parent b329d300e6 262bf31ab7
commit 30c0344a41
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

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