summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 4022ac62bf96..e8b9b1f1dac5 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7244,7 +7244,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (managedUserId < 0) {
return;
}
- if (getCrossProfileCallerIdDisabledForUser(managedUserId)) {
+ if (isCrossProfileQuickContactDisabled(managedUserId)) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG,
"Cross-profile contacts access disabled for user " + managedUserId);
@@ -7260,6 +7260,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
/**
+ * @return true if cross-profile QuickContact is disabled
+ */
+ private boolean isCrossProfileQuickContactDisabled(int userId) {
+ return getCrossProfileCallerIdDisabledForUser(userId)
+ && getCrossProfileContactsSearchDisabledForUser(userId);
+ }
+
+ /**
* @return the user ID of the managed user that is linked to the current user, if any.
* Otherwise -1.
*/