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 am: 2844eaf9f7

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

Change-Id: I1c51d966d766b6d3926618631d29f9d0949f646a
This commit is contained in:
Sooraj Sasindran
2022-03-24 00:40:58 +00:00
committed by Automerger Merge Worker
parent 303e266bee 2844eaf9f7
commit 262bf31ab7
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;
}
}