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

Merge "Remove refs of isSeparateProfileChallengeAllowed"

Browse Source
This commit is contained in:
Ayush Sharma
2021-08-13 15:49:11 +00:00
committed by Android (Google) Code Review
parent 10cde2f003 41873bd7a4
commit 8851afb8ff
10 changed files with 14 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class ChangeProfileScreenLockPreferenceController extends
public boolean isAvailable() {
if (mProfileChallengeUserId == UserHandle.USER_NULL ||
!mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId)) {
!mUm.isManagedProfile(mProfileChallengeUserId)) {
return false;
}
if (!mLockPatternUtils.isSecure(mProfileChallengeUserId)) {

2
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -107,7 +107,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
@Override
public boolean isAvailable() {
return mProfileUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileUserId);
&& mUm.isManagedProfile(mProfileUserId);
}
@Override