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

Commit e72f2c18 authored by Eric Biggers's avatar Eric Biggers
Browse files

Convert locksettings unit tests to use FakeSettingsProvider 

To mock out settings values in the locksettings unit tests, use
com.android.internal.util.test.FakeSettingsProvider instead of the
custom solution that was used before.

This makes mocked settings accessible to SyntheticPasswordManager, via
the Context using the standard methods.  The previous solution only made
mocked settings accessible to LockSettingsService itself, and only when
the special accessor methods in LockSettingsService.Injector were used.

Test: atest com.android.server.locksettings
Bug: 254378141
Change-Id: I16cfc1fc25cc55e66121fc9512fec01915de4885
parent 95d7aa9f

services/core/java/com/android/server/locksettings/LockSettingsService.java

+3 −13
Original line number Diff line number Diff line
@@ -550,16 +550,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
            return (BiometricManager) mContext.getSystemService(Context.BIOMETRIC_SERVICE);

        }



        public int settingsGlobalGetInt(ContentResolver contentResolver, String keyName,

                int defaultValue) {

            return Settings.Global.getInt(contentResolver, keyName, defaultValue);

        }



        public int settingsSecureGetInt(ContentResolver contentResolver, String keyName,

                int defaultValue, int userId) {

            return Settings.Secure.getIntForUser(contentResolver, keyName, defaultValue, userId);

        }



        public java.security.KeyStore getJavaKeyStore() {

            try {

                java.security.KeyStore ks = java.security.KeyStore.getInstance(
@@ -1027,9 +1017,9 @@ public class LockSettingsService extends ILockSettings.Stub { 


    private void enforceFrpResolved() {

        final ContentResolver cr = mContext.getContentResolver();

        final boolean inSetupWizard = mInjector.settingsSecureGetInt(cr,

        final boolean inSetupWizard = Settings.Secure.getIntForUser(cr,

                Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_SYSTEM) == 0;

        final boolean secureFrp = mInjector.settingsSecureGetInt(cr,

        final boolean secureFrp = Settings.Secure.getIntForUser(cr,

                Settings.Secure.SECURE_FRP_MODE, 0, UserHandle.USER_SYSTEM) == 1;

        if (inSetupWizard && secureFrp) {

            throw new SecurityException("Cannot change credential in SUW while factory reset"
@@ -2155,7 +2145,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        if (credential == null || credential.isNone()) {

            throw new IllegalArgumentException("Credential can't be null or empty");

        }

        if (userId == USER_FRP && mInjector.settingsGlobalGetInt(mContext.getContentResolver(),

        if (userId == USER_FRP && Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 0) != 0) {

            Slog.e(TAG, "FRP credential can only be verified prior to provisioning.");

            return VerifyCredentialResponse.ERROR;

services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java

+31 −9
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.app.admin.DevicePolicyManagerInternal; 
import android.app.admin.DeviceStateCache;

import android.app.trust.TrustManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.hardware.authsecret.V1_0.IAuthSecret;
@@ -41,14 +42,18 @@ import android.hardware.fingerprint.FingerprintManager; 
import android.os.FileUtils;

import android.os.IProgressListener;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.IStorageManager;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.security.KeyStore;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.util.test.FakeSettingsProvider;

import com.android.internal.util.test.FakeSettingsProviderRule;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockSettingsInternal;

import com.android.internal.widget.LockscreenCredential;
@@ -59,6 +64,7 @@ import com.android.server.wm.WindowManagerInternal; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.runner.RunWith;

import org.mockito.invocation.InvocationOnMock;

import org.mockito.stubbing.Answer;
@@ -106,7 +112,8 @@ public abstract class BaseLockSettingsServiceTests { 
    FingerprintManager mFingerprintManager;

    FaceManager mFaceManager;

    PackageManager mPackageManager;

    FakeSettings mSettings;

    @Rule

    public FakeSettingsProviderRule mSettingsRule = FakeSettingsProvider.rule();



    @Before

    public void setUp_baseServices() throws Exception {
@@ -126,7 +133,6 @@ public abstract class BaseLockSettingsServiceTests { 
        mFingerprintManager = mock(FingerprintManager.class);

        mFaceManager = mock(FaceManager.class);

        mPackageManager = mock(PackageManager.class);

        mSettings = new FakeSettings();



        LocalServices.removeServiceForTest(LockSettingsInternal.class);

        LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);
@@ -134,12 +140,13 @@ public abstract class BaseLockSettingsServiceTests { 
        LocalServices.addService(DevicePolicyManagerInternal.class, mDevicePolicyManagerInternal);

        LocalServices.addService(WindowManagerInternal.class, mMockWindowManager);



        mContext = new MockLockSettingsContext(InstrumentationRegistry.getContext(), mUserManager,

                mNotificationManager, mDevicePolicyManager, mock(StorageManager.class),

                mock(TrustManager.class), mock(KeyguardManager.class), mFingerprintManager,

                mFaceManager, mPackageManager);

        final Context origContext = InstrumentationRegistry.getContext();

        mContext = new MockLockSettingsContext(origContext,

                mSettingsRule.mockContentResolver(origContext), mUserManager, mNotificationManager,

                mDevicePolicyManager, mock(StorageManager.class), mock(TrustManager.class),

                mock(KeyguardManager.class), mFingerprintManager, mFaceManager, mPackageManager);

        mStorage = new LockSettingsStorageTestable(mContext,

                new File(InstrumentationRegistry.getContext().getFilesDir(), "locksettings"));

                new File(origContext.getFilesDir(), "locksettings"));

        File storageDir = mStorage.mStorageDir;

        if (storageDir.exists()) {

            FileUtils.deleteContents(storageDir);
@@ -153,7 +160,7 @@ public abstract class BaseLockSettingsServiceTests { 
        mService = new LockSettingsServiceTestable(mContext, mStorage,

                mGateKeeperService, mKeyStore, setUpStorageManagerMock(), mActivityManager,

                mSpManager, mAuthSecretService, mGsiService, mRecoverableKeyStoreManager,

                mUserManagerInternal, mDeviceStateCache, mSettings);

                mUserManagerInternal, mDeviceStateCache);

        mService.mHasSecureLockScreen = true;

        when(mUserManager.getUserInfo(eq(PRIMARY_USER_ID))).thenReturn(PRIMARY_USER_INFO);

        mPrimaryUserProfiles.add(PRIMARY_USER_INFO);
@@ -186,10 +193,25 @@ public abstract class BaseLockSettingsServiceTests { 
        mockBiometricsHardwareFingerprintsAndTemplates(PRIMARY_USER_ID);

        mockBiometricsHardwareFingerprintsAndTemplates(MANAGED_PROFILE_USER_ID);



        mSettings.setDeviceProvisioned(true);

        setDeviceProvisioned(true);

        mLocalService = LocalServices.getService(LockSettingsInternal.class);

    }



    protected void setDeviceProvisioned(boolean provisioned) {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, provisioned ? 1 : 0);

    }



    protected void setUserSetupComplete(boolean complete) {

        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, complete ? 1 : 0, UserHandle.USER_SYSTEM);

    }



    protected void setSecureFrpMode(boolean secure) {

        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                Settings.Secure.SECURE_FRP_MODE, secure ? 1 : 0, UserHandle.USER_SYSTEM);

    }



    private UserInfo installChildProfile(int profileId) {

        final UserInfo userInfo = new UserInfo(

            profileId, null, null, UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_MANAGED_PROFILE);

services/tests/servicestests/src/com/android/server/locksettings/FakeSettings.java

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.server.locksettings;



import android.content.ContentResolver;

import android.os.UserHandle;

import android.provider.Settings;



public class FakeSettings {



    private int mDeviceProvisioned;

    private int mSecureFrpMode;

    private int mUserSetupComplete;



    public void setDeviceProvisioned(boolean provisioned) {

        mDeviceProvisioned = provisioned ? 1 : 0;

    }



    public void setSecureFrpMode(boolean secure) {

        mSecureFrpMode = secure ? 1 : 0;

    }



    public void setUserSetupComplete(boolean complete) {

        mUserSetupComplete = complete ? 1 : 0;

    }



    public int globalGetInt(String keyName) {

        switch (keyName) {

            case Settings.Global.DEVICE_PROVISIONED:

                return mDeviceProvisioned;

            default:

                throw new IllegalArgumentException("Unhandled global settings: " + keyName);

        }

    }



    public int secureGetInt(ContentResolver contentResolver, String keyName, int defaultValue,

            int userId) {

        if (Settings.Secure.SECURE_FRP_MODE.equals(keyName) && userId == UserHandle.USER_SYSTEM) {

            return mSecureFrpMode;

        }

        if (Settings.Secure.USER_SETUP_COMPLETE.equals(keyName)

                && userId == UserHandle.USER_SYSTEM) {

            return mUserSetupComplete;

        }

        return defaultValue;

    }

}

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java

+4 −21
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock; 


import android.app.IActivityManager;

import android.app.admin.DeviceStateCache;

import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.UserInfo;

import android.hardware.authsecret.V1_0.IAuthSecret;
@@ -52,14 +51,12 @@ public class LockSettingsServiceTestable extends LockSettingsService { 
        private RecoverableKeyStoreManager mRecoverableKeyStoreManager;

        private UserManagerInternal mUserManagerInternal;

        private DeviceStateCache mDeviceStateCache;

        private FakeSettings mSettings;



        public MockInjector(Context context, LockSettingsStorage storage, KeyStore keyStore,

                IActivityManager activityManager,

                IStorageManager storageManager, SyntheticPasswordManager spManager,

                FakeGsiService gsiService, RecoverableKeyStoreManager recoverableKeyStoreManager,

                UserManagerInternal userManagerInternal, DeviceStateCache deviceStateCache,

                FakeSettings settings) {

                UserManagerInternal userManagerInternal, DeviceStateCache deviceStateCache) {

            super(context);

            mLockSettingsStorage = storage;

            mKeyStore = keyStore;
@@ -70,7 +67,6 @@ public class LockSettingsServiceTestable extends LockSettingsService { 
            mRecoverableKeyStoreManager = recoverableKeyStoreManager;

            mUserManagerInternal = userManagerInternal;

            mDeviceStateCache = deviceStateCache;

            mSettings = settings;

        }



        @Override
@@ -118,18 +114,6 @@ public class LockSettingsServiceTestable extends LockSettingsService { 
            return mSpManager;

        }



        @Override

        public int settingsGlobalGetInt(ContentResolver contentResolver, String keyName,

                int defaultValue) {

            return mSettings.globalGetInt(keyName);

        }



        @Override

        public int settingsSecureGetInt(ContentResolver contentResolver, String keyName,

                int defaultValue, int userId) {

            return mSettings.secureGetInt(contentResolver, keyName, defaultValue, userId);

        }



        @Override

        public UserManagerInternal getUserManagerInternal() {

            return mUserManagerInternal;
@@ -165,11 +149,10 @@ public class LockSettingsServiceTestable extends LockSettingsService { 
            IStorageManager storageManager, IActivityManager mActivityManager,

            SyntheticPasswordManager spManager, IAuthSecret authSecretService,

            FakeGsiService gsiService, RecoverableKeyStoreManager recoverableKeyStoreManager,

            UserManagerInternal userManagerInternal, DeviceStateCache deviceStateCache,

            FakeSettings settings) {

            UserManagerInternal userManagerInternal, DeviceStateCache deviceStateCache) {

        super(new MockInjector(context, storage, keystore, mActivityManager,

                storageManager, spManager, gsiService,

                recoverableKeyStoreManager, userManagerInternal, deviceStateCache, settings));

                storageManager, spManager, gsiService, recoverableKeyStoreManager,

                userManagerInternal, deviceStateCache));

        mGateKeeperService = gatekeeper;

        mAuthSecretService = authSecretService;

    }

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java

+4 −4
Original line number Diff line number Diff line
@@ -424,8 +424,8 @@ public class LockSettingsServiceTests extends BaseLockSettingsServiceTests { 


    @Test

    public void testCredentialChangeNotPossibleInSecureFrpModeDuringSuw() {

        mSettings.setUserSetupComplete(false);

        mSettings.setSecureFrpMode(true);

        setUserSetupComplete(false);

        setSecureFrpMode(true);

        try {

            mService.setLockCredential(newPassword("1234"), nonePassword(), PRIMARY_USER_ID);

            fail("Password shouldn't be changeable before FRP unlock");
@@ -434,8 +434,8 @@ public class LockSettingsServiceTests extends BaseLockSettingsServiceTests { 


    @Test

    public void testCredentialChangePossibleInSecureFrpModeAfterSuw() {

        mSettings.setUserSetupComplete(true);

        mSettings.setSecureFrpMode(true);

        setUserSetupComplete(true);

        setSecureFrpMode(true);

        assertTrue(mService.setLockCredential(newPassword("1234"), nonePassword(),

                PRIMARY_USER_ID));

    }