Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea57771 authored by Avinash Vadlamudi's avatar Avinash Vadlamudi Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788



Change-Id: If440d5c2a6e65a760af7836b180e443c420a5991
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3b86809 4e460ed4

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

+0 −9
Original line number Diff line number Diff line
@@ -27,10 +27,8 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; 
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;

import static android.provider.DeviceConfig.NAMESPACE_AUTO_PIN_CONFIRMATION;

import static android.view.WindowManager.LayoutParams.FLAG_SECURE;



import static com.android.internal.widget.LockPatternUtils.FLAG_ENABLE_AUTO_PIN_CONFIRMATION;

import static com.android.internal.widget.LockPatternUtils.PASSWORD_TYPE_KEY;

import static com.android.settings.password.ChooseLockGeneric.CONFIRM_CREDENTIALS;
@@ -45,7 +43,6 @@ import android.app.admin.PasswordMetrics; 
import android.app.admin.PasswordPolicy;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.view.View;

import android.widget.CheckBox;

import android.widget.TextView;
@@ -55,7 +52,6 @@ import com.android.settings.R; 
import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;

import com.android.settings.password.ChooseLockPassword.IntentBuilder;

import com.android.settings.testutils.shadow.SettingsShadowResources;

import com.android.settings.testutils.shadow.ShadowDeviceConfig;

import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;

import com.android.settings.testutils.shadow.ShadowLockPatternUtils;

import com.android.settings.testutils.shadow.ShadowUtils;
@@ -79,7 +75,6 @@ import org.robolectric.shadows.ShadowDrawable; 
        ShadowLockPatternUtils.class,

        ShadowUtils.class,

        ShadowDevicePolicyManager.class,

        ShadowDeviceConfig.class,

})

public class ChooseLockPasswordTest {

    @Before
@@ -435,8 +430,6 @@ public class ChooseLockPasswordTest { 


    @Test

    public void autoPinConfirmOption_featureEnabledAndUntouchedByUser_changeStateAsPerRules() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                /* value= */ "true", /* makeDefault= */ false);

        ChooseLockPassword passwordActivity = setupActivityWithPinTypeAndDefaultPolicy();



        ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity);
@@ -473,8 +466,6 @@ public class ChooseLockPasswordTest { 


    @Test

    public void autoPinConfirmOption_featureEnabledAndModifiedByUser_shouldChangeStateAsPerRules() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                /* value= */ "true", /* makeDefault= */ false);

        ChooseLockPassword passwordActivity = setupActivityWithPinTypeAndDefaultPolicy();



        ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity);

tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java

+0 −29
Original line number Diff line number Diff line
@@ -16,22 +16,16 @@ 


package com.android.settings.security.screenlock;



import static android.provider.DeviceConfig.NAMESPACE_AUTO_PIN_CONFIRMATION;



import static com.android.internal.widget.LockPatternUtils.FLAG_ENABLE_AUTO_PIN_CONFIRMATION;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.when;



import android.content.Context;

import android.provider.DeviceConfig;



import androidx.preference.SwitchPreference;

import androidx.test.core.app.ApplicationProvider;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.testutils.shadow.ShadowDeviceConfig;

import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;



import org.junit.Before;
@@ -40,10 +34,8 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowDeviceConfig.class})

public class AutoPinConfirmPreferenceControllerTest {

    private static final Integer TEST_USER_ID = 1;

    @Mock
@@ -65,8 +57,6 @@ public class AutoPinConfirmPreferenceControllerTest { 


    @Test

    public void isAvailable_featureEnabledAndLockSetToNone_shouldReturnFalse() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "true", /* makeDefault */ false);

        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);



        assertThat(mController.isAvailable()).isFalse();
@@ -74,8 +64,6 @@ public class AutoPinConfirmPreferenceControllerTest { 


    @Test

    public void isAvailable_featureEnabledAndLockSetToPassword_shouldReturnFalse() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "true", /* makeDefault */ false);

        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);

        when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID))

                .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PASSWORD);
@@ -85,8 +73,6 @@ public class AutoPinConfirmPreferenceControllerTest { 


    @Test

    public void isAvailable_featureEnabledAndLockSetToPIN_lengthLessThanSix_shouldReturnFalse() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "true", /* makeDefault */ false);

        when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID))

                .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PIN);

        when(mLockPatternUtils.getPinLength(TEST_USER_ID)).thenReturn(5);
@@ -96,8 +82,6 @@ public class AutoPinConfirmPreferenceControllerTest { 


    @Test

    public void isAvailable_featureEnabledAndLockSetToPIN_lengthMoreThanEqSix_shouldReturnTrue() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "true", /* makeDefault */ false);

        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);

        when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID))

                .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PIN);
@@ -106,21 +90,8 @@ public class AutoPinConfirmPreferenceControllerTest { 
        assertThat(mController.isAvailable()).isTrue();

    }



    @Test

    public void isAvailable_featureDisabledAndLockSetToPIN_shouldReturnFalse() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "false", /* makeDefault */ false);

        when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true);

        when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID))

                .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PIN);



        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void updateState_ChangingSettingState_shouldSetPreferenceToAppropriateCheckedState() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

                "true", /* makeDefault */ false);

        // When auto_pin_confirm setting is disabled, switchPreference is unchecked

        when(mLockPatternUtils.isAutoPinConfirmEnabled(TEST_USER_ID)).thenReturn(false);

        mController.updateState(mPreference);