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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 0d7b279..872f71f 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -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;
         }