summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-10-07 17:43:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 17:43:08 +0000
commit4797554ab8522ffc3dbf6f4ede111dcbbb7bb757 (patch)
tree912b42db7664facda4bd2d39aa60a1feb55aa024 /packages
parent97e9a034b99dfacf64dec38be608d7db24a31e9e (diff)
parentb86671f4b8263affaa561796862bd4149235b1d3 (diff)
downloadframeworks_base-4797554ab8522ffc3dbf6f4ede111dcbbb7bb757.zip
frameworks_base-4797554ab8522ffc3dbf6f4ede111dcbbb7bb757.tar.gz
frameworks_base-4797554ab8522ffc3dbf6f4ede111dcbbb7bb757.tar.bz2
am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit 'b86671f4b8263affaa561796862bd4149235b1d3': 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