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

Merge "Fix that can't launch managed QuickContact in ContactSearch"

Browse Source
This commit is contained in:
Victor Chang
2016-02-02 11:02:07 +00:00
committed by Android (Google) Code Review
parent 10c3d3f666 70b1751d14
commit fe13c5fbe1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
@@ -7259,6 +7259,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.