commit d812e7a10ecb95f31e08641642c2b22b7cd0050b
author Amith Yamasani <yamasani@google.com> Mon Nov 05 09:33:57 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 05 09:33:57 2012 -0800
tree 22abdd2063997ea8533a006cbdf7bb06df3d5513
parent 57f928fc4afc02d2fe45523efea687eee7f86c02
parent fca8d258c5699ad2703d46181c492e78e1dc87a8

am fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev

* commit 'fca8d258c5699ad2703d46181c492e78e1dc87a8':
  Remove power menu user switcher

policy/src/com/android/internal/policy/impl/GlobalActions.java

diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
index c215f1b..d1f8ef1 100644
--- a/policy/src/com/android/internal/policy/impl/GlobalActions.java
+++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -314,8 +314,7 @@
         }
 
         // one more thing: optionally add a list of users to switch to
-        // temporarily enable this by default
-        if (true || SystemProperties.getBoolean("fw.power_user_switcher", false)) {
+        if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {
             addUsersToMenu(mItems);
         }