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

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

Merge "Remove prohibition on switching to user 0 in demo" into pi-dev am: 445a6c6b 

am: 23a682bb

Change-Id: Id8c4af80d5ecc64cf5d78d10f09d81baa5b17722
parents 4c926cc1 23a682bb

services/core/java/com/android/server/am/UserController.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -1184,11 +1184,6 @@ class UserController implements Handler.Callback { 
            Slog.w(TAG, "No user info for user #" + targetUserId);

            Slog.w(TAG, "No user info for user #" + targetUserId);

            return false;

            return false;

        }

        }

        if (!targetUserInfo.isDemo() && UserManager.isDeviceInDemoMode(mInjector.getContext())) {

            Slog.w(TAG, "Cannot switch to non-demo user #" + targetUserId

                    + " when device is in demo mode");

            return false;

        }

        if (!targetUserInfo.supportsSwitchTo()) {

        if (!targetUserInfo.supportsSwitchTo()) {

            Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not supported");

            Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not supported");

            return false;

            return false;