commit 55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c
author Guang Zhu <guangzhu@google.com> Tue Oct 21 22:12:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 21 22:12:38 2014 +0000
tree 8bebbbd9f9d9bb17b4d62551d0b89e87713742cf
parent c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9
parent ccbeb61ac21527839deb115199cbe98fa2b73c05

am ccbeb61a: Block monkey from creating user profiles

* commit 'ccbeb61ac21527839deb115199cbe98fa2b73c05':
  Block monkey from creating user profiles

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

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 eb808c2..5c7909a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -571,6 +571,9 @@
                 cancel();
             } else {
                 dismiss();
+                if (ActivityManager.isUserAMonkey()) {
+                    return;
+                }
                 UserInfo user = mUserManager.createSecondaryUser(
                         mContext.getString(R.string.user_new_user_name), 0 /* flags */);
                 if (user == null) {