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

Commit 205585e5 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Disable lock screen by default for demo users" into oc-dr1-dev

parents 19821880 5856be88

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −1
Original line number Diff line number Diff line
@@ -648,8 +648,12 @@ public class LockPatternUtils { 
        boolean disabledByDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_disableLockscreenByDefault);

        boolean isSystemUser = UserManager.isSplitSystemUser() && userId == UserHandle.USER_SYSTEM;

        UserInfo userInfo = getUserManager().getUserInfo(userId);

        boolean isDemoUser = UserManager.isDeviceInDemoMode(mContext) && userInfo != null

                && userInfo.isDemo();

        return getBoolean(DISABLE_LOCKSCREEN_KEY, false, userId)

                || (disabledByDefault && !isSystemUser);

                || (disabledByDefault && !isSystemUser)

                || isDemoUser;

    }



    /**

core/tests/utiltests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />

    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />



    <application>

        <uses-library android:name="android.test.runner" />

core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java

0 → 100644
+100 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.internal.util;



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

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



import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.ContextWrapper;

import android.content.pm.UserInfo;

import android.os.UserManager;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import android.test.mock.MockContentResolver;

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

import com.android.internal.widget.ILockSettings;

import com.android.internal.widget.LockPatternUtils;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mockito;



@RunWith(AndroidJUnit4.class)

@SmallTest

public class LockPatternUtilsTest {



    private static final int DEMO_USER_ID = 5;



    private LockPatternUtils mLockPatternUtils;



    private void configureTest(boolean isSecure, boolean isDemoUser, int deviceDemoMode)

            throws Exception {

        final Context context = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));



        final MockContentResolver cr = new MockContentResolver(context);

        cr.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        when(context.getContentResolver()).thenReturn(cr);

        Settings.Global.putInt(cr, Settings.Global.DEVICE_DEMO_MODE, deviceDemoMode);



        final ILockSettings ils = Mockito.mock(ILockSettings.class);

        when(ils.havePassword(DEMO_USER_ID)).thenReturn(isSecure);

        when(ils.getLong("lockscreen.password_type", PASSWORD_QUALITY_UNSPECIFIED, DEMO_USER_ID))

                .thenReturn((long) PASSWORD_QUALITY_MANAGED);

        // TODO(b/63758238): stop spying the class under test

        mLockPatternUtils = spy(new LockPatternUtils(context));

        when(mLockPatternUtils.getLockSettings()).thenReturn(ils);



        final UserInfo userInfo = Mockito.mock(UserInfo.class);

        when(userInfo.isDemo()).thenReturn(isDemoUser);

        final UserManager um = Mockito.mock(UserManager.class);

        when(um.getUserInfo(DEMO_USER_ID)).thenReturn(userInfo);

        when(context.getSystemService(Context.USER_SERVICE)).thenReturn(um);

    }



    @Test

    public void isLockScreenDisabled_isDemoUser_true() throws Exception {

        configureTest(false, true, 2);

        assertTrue(mLockPatternUtils.isLockScreenDisabled(DEMO_USER_ID));

    }



    @Test

    public void isLockScreenDisabled_isSecureAndDemoUser_false() throws Exception {

        configureTest(true, true, 2);

        assertFalse(mLockPatternUtils.isLockScreenDisabled(DEMO_USER_ID));

    }



    @Test

    public void isLockScreenDisabled_isNotDemoUser_false() throws Exception {

        configureTest(false, false, 2);

        assertFalse(mLockPatternUtils.isLockScreenDisabled(DEMO_USER_ID));

    }



    @Test

    public void isLockScreenDisabled_isNotInDemoMode_false() throws Exception {

        configureTest(false, true, 0);

        assertFalse(mLockPatternUtils.isLockScreenDisabled(DEMO_USER_ID));

    }

}