summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-10-12 13:13:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-12 13:13:25 -0700
commitfe49af266ea09bb83438c7694051bc950c5c7437 (patch)
tree184cd8c1341f4b101d91c4d390f8a009a94930d2 /policy
parent3add43ab0e26c9fd44d4dea683092807229eaa59 (diff)
parentff54920ed222a2bd6abe618743a5a3e9fe10bd4b (diff)
downloadframeworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.zip
frameworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.tar.gz
frameworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.tar.bz2
Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/GlobalActions.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index 11b58bc..9ea47f9 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -314,7 +314,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
}
// one more thing: optionally add a list of users to switch to
- if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {
+ // temporarily enable this by default
+ if (true || SystemProperties.getBoolean("fw.power_user_switcher", false)) {
addUsersToMenu(mItems);
}