PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 am: ecca6508da

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I5dbb93387c02bff45b4fc572f8e2a654837a4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-08-11 02:22:33 +00:00
committed by Automerger Merge Worker
parent 38a0dbf56e ecca6508da
commit 47e19db82e
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/security/ShowPasswordPreferenceController.java
View File

@@ -17,25 +17,17 @@
package com.android.settings.security; package com.android.settings.security;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
public class ShowPasswordPreferenceController extends TogglePreferenceController { public class ShowPasswordPreferenceController extends TogglePreferenceController {
private static final String KEY_SHOW_PASSWORD = "show_password"; 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) { public ShowPasswordPreferenceController(Context context) {
super(context, KEY_SHOW_PASSWORD); super(context, KEY_SHOW_PASSWORD);
mLockPatternUtils = FeatureFactory.getFactory(context)
.getSecurityFeatureProvider()
.getLockPatternUtils(context);
} }
@Override @Override
@@ -48,7 +40,6 @@ public class ShowPasswordPreferenceController extends TogglePreferenceController
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD, Settings.System.putInt(mContext.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
isChecked ? 1 : 0); isChecked ? 1 : 0);
mLockPatternUtils.setVisiblePasswordEnabled(isChecked, MY_USER_ID);
return true; return true;
} }

13
tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
View File

@@ -18,20 +18,15 @@ package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
@@ -45,12 +40,9 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ShowPasswordPreferenceControllerTest { public class ShowPasswordPreferenceControllerTest {
@Mock
private LockPatternUtils mLockPatternUtils;
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private FakeFeatureFactory mFeatureFactory;
private Context mContext; private Context mContext;
private ShowPasswordPreferenceController mController; private ShowPasswordPreferenceController mController;
private Preference mPreference; private Preference mPreference;
@@ -59,9 +51,6 @@ public class ShowPasswordPreferenceControllerTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
.thenReturn(mLockPatternUtils);
mController = new ShowPasswordPreferenceController(mContext); mController = new ShowPasswordPreferenceController(mContext);
mPreference = new Preference(mContext); mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey()); mPreference.setKey(mController.getPreferenceKey());
@@ -100,7 +89,6 @@ public class ShowPasswordPreferenceControllerTest {
mController.onPreferenceChange(mPreference, true); mController.onPreferenceChange(mPreference, true);
assertThat(mController.isChecked()).isTrue(); assertThat(mController.isChecked()).isTrue();
verify(mLockPatternUtils).setVisiblePasswordEnabled(true, UserHandle.myUserId());
} }
@Test @Test
@@ -108,6 +96,5 @@ public class ShowPasswordPreferenceControllerTest {
mController.onPreferenceChange(mPreference, false); mController.onPreferenceChange(mPreference, false);
assertThat(mController.isChecked()).isFalse(); assertThat(mController.isChecked()).isFalse();
verify(mLockPatternUtils).setVisiblePasswordEnabled(false, UserHandle.myUserId());
} }
} }