diff options
| -rw-r--r-- | core/java/android/os/UserManager.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 0a149bbac713..f26693c853fb 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -929,9 +929,6 @@ public class UserManager { if (guest != null) { Settings.Secure.putStringForUser(context.getContentResolver(), Settings.Secure.SKIP_FIRST_USE_HINTS, "1", guest.id); - - mService.setUserRestriction(DISALLOW_SMS, true, guest.id); - mService.setUserRestriction(DISALLOW_INSTALL_UNKNOWN_SOURCES, true, guest.id); } } catch (RemoteException re) { Log.w(TAG, "Could not create a user", re); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 424b90234ca2..da10a94215dc 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -652,6 +652,7 @@ public class UserManagerService extends IUserManager.Stub { private void initDefaultGuestRestrictions() { synchronized (mGuestRestrictions) { if (mGuestRestrictions.isEmpty()) { + mGuestRestrictions.putBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); } @@ -1652,6 +1653,11 @@ public class UserManagerService extends IUserManager.Stub { } updateUserIds(); Bundle restrictions = new Bundle(); + if (isGuest) { + synchronized (mGuestRestrictions) { + restrictions.putAll(mGuestRestrictions); + } + } synchronized (mRestrictionsLock) { mBaseUserRestrictions.append(userId, restrictions); } |