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/biometrics/combination/BiometricFaceProfileStatusPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class BiometricFaceProfileStatusPreferenceController extends
@Override
protected boolean isUserSupported() {
return mProfileChallengeUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);
&& mUm.isManagedProfile(mProfileChallengeUserId);
}
@Override

2
src/com/android/settings/biometrics/combination/BiometricFingerprintProfileStatusPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class BiometricFingerprintProfileStatusPreferenceController extends
@Override
protected boolean isUserSupported() {
return mProfileChallengeUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);
&& mUm.isManagedProfile(mProfileChallengeUserId);
}
@Override

2
src/com/android/settings/biometrics/combination/CombinedBiometricProfileStatusPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class CombinedBiometricProfileStatusPreferenceController extends
@Override
protected boolean isUserSupported() {
return mProfileChallengeUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);
&& mUm.isManagedProfile(mProfileChallengeUserId);
}
@Override

2
src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
View File

@@ -59,7 +59,7 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC
@Override
protected boolean isUserSupported() {
return mProfileChallengeUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);
&& mUm.isManagedProfile(mProfileChallengeUserId);
}
@Override

2
src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
View File

@@ -46,7 +46,7 @@ public class FingerprintProfileStatusPreferenceController
@Override
protected boolean isUserSupported() {
return mProfileChallengeUserId != UserHandle.USER_NULL
&& mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);
&& mUm.isManagedProfile(mProfileChallengeUserId);
}
@Override

17
src/com/android/settings/password/SetNewPasswordController.java
View File

@@ -36,7 +36,6 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.Utils;
/**
@@ -68,17 +67,15 @@ final class SetNewPasswordController {
public static SetNewPasswordController create(Context context, Ui ui, Intent intent,
IBinder activityToken) {
// Trying to figure out which user is setting new password. If it is
// ACTION_SET_NEW_PARENT_PROFILE_PASSWORD or the calling user is not allowed to set
// separate profile challenge, it is the current user to set new password. Otherwise,
// it is the user who starts this activity setting new password.
int userId = ActivityManager.getCurrentUser();
// ACTION_SET_NEW_PARENT_PROFILE_PASSWORD, it is the current user to set
// new password. Otherwise, it is the user who starts this activity
// setting new password.
final int userId;
if (ACTION_SET_NEW_PASSWORD.equals(intent.getAction())) {
final int callingUserId = Utils.getSecureTargetUser(activityToken,
userId = Utils.getSecureTargetUser(activityToken,
UserManager.get(context), null, intent.getExtras()).getIdentifier();
final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
if (lockPatternUtils.isSeparateProfileChallengeAllowed(callingUserId)) {
userId = callingUserId;
}
} else {
userId = ActivityManager.getCurrentUser();
}
// Create a wrapper of FingerprintManager for testing, see IFingerPrintManager for details.
final FingerprintManager fingerprintManager = Utils.getFingerprintManagerOrNull(context);

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