summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-10-07 17:33:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 17:33:25 +0000
commitb86671f4b8263affaa561796862bd4149235b1d3 (patch)
tree9defb8d655e9ad0eb22289cc9d8582f2addc17ef /packages
parent2c52c443dcca748279e386160143ae388b19bb66 (diff)
parent41bb3455e44dc8fde4569bbfd56fa20c6da8a27d (diff)
downloadframeworks_base-b86671f4b8263affaa561796862bd4149235b1d3.zip
frameworks_base-b86671f4b8263affaa561796862bd4149235b1d3.tar.gz
frameworks_base-b86671f4b8263affaa561796862bd4149235b1d3.tar.bz2
am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d': Set the default user restrictions to disallow calling and sms
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index bbe6622..eb808c2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -571,7 +571,7 @@ public class UserSwitcherController {
cancel();
} else {
dismiss();
- UserInfo user = mUserManager.createUser(
+ UserInfo user = mUserManager.createSecondaryUser(
mContext.getString(R.string.user_new_user_name), 0 /* flags */);
if (user == null) {
// Couldn't create user, most likely because there are too many, but we haven't