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

Amith Yamasani · Android Git Automerger · commit d812e7a10ecb · 2012-11-05T09:33:57.000-08:00
* commit 'fca8d258c5699ad2703d46181c492e78e1dc87a8':
  Remove power menu user switcher
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -314,8 +314,7 @@ public boolean showBeforeProvisioning() {
         }
 
         // 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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ public boolean showBeforeProvisioning() {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`// one more thing: optionally add a list of users to switch to`
`317`		`- // temporarily enable this by default`
`318`		`- if (true \|\| SystemProperties.getBoolean("fw.power_user_switcher", false)) {`
	`317`	`+ if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {`
`319`	`318`	`addUsersToMenu(mItems);`
`320`	`319`	`}`
`321`	`320`