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

Commit 536258c5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Once system is provisioned, lock the screen on system user"

parents 63098f4d cb15d66f

core/java/android/provider/Settings.java

+4 −1
Original line number Diff line number Diff line
@@ -6285,7 +6285,10 @@ public final class Settings { 
       public static final String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";



       /**

        * Whether the device has been provisioned (0 = false, 1 = true)

        * Whether the device has been provisioned (0 = false, 1 = true).

        * <p>On a multiuser device with a separate system user, the screen may be locked

        * as soon as this is set to true and further activities cannot be launched on the

        * system user unless they are marked to show over keyguard.

        */

       public static final String DEVICE_PROVISIONED = "device_provisioned";

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −0
Original line number Diff line number Diff line
@@ -379,6 +379,13 @@ public class KeyguardViewMediator extends SystemUI { 
        @Override

        public void onDeviceProvisioned() {

            sendUserPresentBroadcast();

            synchronized (KeyguardViewMediator.this) {

                // If system user is provisioned, we might want to lock now to avoid showing launcher

                if (UserManager.isSplitSystemUser()

                        && KeyguardUpdateMonitor.getCurrentUser() == UserHandle.USER_SYSTEM) {

                    doKeyguardLocked(null);

                }

            }

        }



        @Override