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

Commit f5d14b2a authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Don't allow creating a guest from a secondary user... 

unless the primary user has allowed Guest and user creation from
lockscreen.

Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
parent 09a11d5b

src/com/android/settings/users/UserSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -920,8 +920,11 @@ public class UserSettings extends SettingsPreferenceFragment 
                return;

            }

        }

        // No guest user. Create one.

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {

        // No guest user. Create one, if there's no restriction.

        // If it is not the primary user, then adding users from lockscreen must be enabled

        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)

                || (!mIsOwner && Settings.Global.getInt(getContentResolver(),

                        Settings.Global.ADD_USERS_WHEN_LOCKED, 0) != 1)) {

            Log.i(TAG, "Blocking guest creation because it is restricted");

            return;

        }