Merge "Use the right userId when setting restrictions" into nyc-dev

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

@@ -78,9 +78,8 @@ public class RestrictionUtils {
     public static void setRestrictions(Context context, ArrayList<RestrictionEntry> entries,
             UserHandle user) {
         UserManager um = UserManager.get(context);
-
         for (RestrictionEntry entry : entries) {
-            um.setUserRestriction(entry.getKey(), !entry.getSelectedState());
+            um.setUserRestriction(entry.getKey(), !entry.getSelectedState(), user);
         }
     }
 }