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

Commit ff264d07 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8

am: f3b67686

Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11
parents dc8deb9f f3b67686
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ public class KeyguardViewMediator extends SystemUI {
    }

    boolean mustNotUnlockCurrentUser() {
        return (UserManager.isSplitSystemUser() || UserManager.isDeviceInDemoMode(mContext))
        return UserManager.isSplitSystemUser()
                && KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM;
    }