commit f5f45bc224d69f478ce446d85720a514a3d12f7e
author Amith Yamasani <yamasani@google.com> Thu Jul 31 22:02:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 29 22:44:51 2014 +0000
tree 33e2c4820bcd944b999bfc8cba8cc83d5c2ff236
parent 68f96d8db5e5e701b6a12b5cddecc985e56a26c6
parent 8616af1a4dd1877996fbd5bb0179659f4f123573

Merge "Setup correct initial guest restrictions" into lmp-dev

core/java/android/os/UserManager.java

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index d385131..13f93a7 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -625,8 +625,9 @@
             Settings.Secure.putStringForUser(context.getContentResolver(),
                     Settings.Secure.SKIP_FIRST_USE_HINTS, "1", guest.id);
             try {
-                mService.setUserRestrictions(
-                        mService.getDefaultGuestRestrictions(), guest.id);
+                Bundle guestRestrictions = mService.getDefaultGuestRestrictions();
+                guestRestrictions.putBoolean(DISALLOW_SMS, true);
+                mService.setUserRestrictions(guestRestrictions, guest.id);
             } catch (RemoteException re) {
                 Log.w(TAG, "Could not update guest restrictions");
             }