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

Commit cacf91e4 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am:... 

Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am: 55c7c9c2" into nyc-mr1-dev-plus-aosp
parents 0357ea40 a5a732e8

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

+3 −2
Original line number Diff line number Diff line
@@ -321,8 +321,6 @@ public class RetailDemoModeService extends SystemService { 
    private void setupDemoUser(UserInfo userInfo) {

        UserManager um = getUserManager();

        UserHandle user = UserHandle.of(userInfo.id);

        LockPatternUtils lockPatternUtils = new LockPatternUtils(getContext());

        lockPatternUtils.setLockScreenDisabled(true, userInfo.id);

        um.setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, user);

        um.setUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true, user);

        um.setUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, true, user);
@@ -497,6 +495,9 @@ public class RetailDemoModeService extends SystemService { 
        mAmi.updatePersistentConfigurationForUser(getSystemUsersConfiguration(), userId);

        turnOffAllFlashLights();

        muteVolumeStreams();

        // Disable lock screen for demo users.

        LockPatternUtils lockPatternUtils = new LockPatternUtils(getContext());

        lockPatternUtils.setLockScreenDisabled(true, userId);

        mNm.notifyAsUser(TAG, 1, createResetNotification(), UserHandle.of(userId));



        synchronized (mActivityLock) {