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

Commit 5817a9d6 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

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

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

Change-Id: I9f3a9dcfdf89343446b9dd2a63ec256459fbf9f7
parents f35a54f9 cacf91e4

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) {