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

Merge "Fix NPE in streamin policy getters."

Browse Source
This commit is contained in:
Pavel Grafov
2023-01-19 16:39:06 +00:00
committed by Android (Google) Code Review
parent 6ccb18f37b a380749398
commit 0d6ab7bd94
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7960,13 +7960,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));
synchronized (getLockObject()) {
if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) {
final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);
return admin.mNearbyNotificationStreamingPolicy;
}
final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);
return admin != null
? admin.mNearbyNotificationStreamingPolicy
: NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;
}
return NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;
}
@Override
@@ -8001,13 +7999,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));
synchronized (getLockObject()) {
if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) {
final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);
return admin.mNearbyAppStreamingPolicy;
}
final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);
return admin != null
? admin.mNearbyAppStreamingPolicy
: NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;
}
return NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;
}
/**