Settings UI fix for missing secure lock screen feature.

Bug: 123737250
Bug: 111072170
Bug: 111071972
Test: manual both with and without the feature flag
Test: make RunSettingsRoboTests

Change-Id: Iacefa95dce85d860633315e074cbf2772691cfdd
This commit is contained in:
Lenka Trochtova
2019-01-25 17:21:54 +01:00
parent 0d8d233a3d
commit bb8e81770b
7 changed files with 42 additions and 10 deletions

View File

@@ -238,8 +238,8 @@ public class ChooseLockGeneric extends SettingsActivity {
UserManager.get(getActivity()),
getArguments(),
getActivity().getIntent().getExtras()).getIdentifier();
mController =
new ChooseLockGenericController(getContext(), mUserId, mRequestedMinComplexity);
mController = new ChooseLockGenericController(
getContext(), mUserId, mRequestedMinComplexity, mLockPatternUtils);
if (ACTION_SET_NEW_PASSWORD.equals(chooseLockAction)
&& UserManager.get(getActivity()).isManagedProfile(mUserId)
&& mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {