Merge changes from topic "locksettings-aosp-first" into main
* changes:
ChooseLockPattern: remove redundant setting of visible pattern default
Stop calling LockPatternUtils.setVisiblePasswordEnabled()
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index c0342d1..e1e7047 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -889,7 +889,6 @@
private LockscreenCredential mChosenPattern;
private LockscreenCredential mCurrentCredential;
- private boolean mLockVirgin;
public void start(LockPatternUtils utils, boolean credentialRequired,
boolean requestGatekeeperPassword, LockscreenCredential chosenPattern,
@@ -901,8 +900,6 @@
mChosenPattern = chosenPattern;
mUserId = userId;
- mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
-
start();
}
@@ -933,14 +930,5 @@
}
return Pair.create(success, result);
}
-
- @Override
- protected void finish(Intent resultData) {
- if (mLockVirgin) {
- mUtils.setVisiblePatternEnabled(true, mUserId);
- }
-
- super.finish(resultData);
- }
}
}
diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java
index 696854a..a6e4db6 100644
--- a/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -17,25 +17,17 @@
package com.android.settings.security;
import android.content.Context;
-import android.os.UserHandle;
import android.provider.Settings;
-import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
public class ShowPasswordPreferenceController extends TogglePreferenceController {
private static final String KEY_SHOW_PASSWORD = "show_password";
- private static final int MY_USER_ID = UserHandle.myUserId();
- private final LockPatternUtils mLockPatternUtils;
public ShowPasswordPreferenceController(Context context) {
super(context, KEY_SHOW_PASSWORD);
- mLockPatternUtils = FeatureFactory.getFactory(context)
- .getSecurityFeatureProvider()
- .getLockPatternUtils(context);
}
@Override
@@ -48,7 +40,6 @@
public boolean setChecked(boolean isChecked) {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
isChecked ? 1 : 0);
- mLockPatternUtils.setVisiblePasswordEnabled(isChecked, MY_USER_ID);
return true;
}
diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
index 5e3c27a..206dee1 100644
--- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
@@ -18,20 +18,15 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
-import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,11 +40,8 @@
public class ShowPasswordPreferenceControllerTest {
@Mock
- private LockPatternUtils mLockPatternUtils;
- @Mock
private PreferenceScreen mScreen;
- private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private ShowPasswordPreferenceController mController;
private Preference mPreference;
@@ -58,9 +50,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
- .thenReturn(mLockPatternUtils);
mController = new ShowPasswordPreferenceController(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
@@ -98,7 +87,6 @@
mController.onPreferenceChange(mPreference, true);
assertThat(mController.isChecked()).isTrue();
- verify(mLockPatternUtils).setVisiblePasswordEnabled(true, UserHandle.myUserId());
}
@Test
@@ -106,6 +94,5 @@
mController.onPreferenceChange(mPreference, false);
assertThat(mController.isChecked()).isFalse();
- verify(mLockPatternUtils).setVisiblePasswordEnabled(false, UserHandle.myUserId());
}
}