am ba789da8: Merge "Setup correct initial guest restrictions" into lmp-dev

* commit 'ba789da811819e316410ee66e0c095f68dfcd40f':
  Setup correct initial guest restrictions
This commit is contained in:
Amith Yamasani
2014-07-31 22:08:36 +00:00
committed by Android Git Automerger

View File

@ -625,8 +625,9 @@ public class UserManager {
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");
}