Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

This commit is contained in:
Nicolas Prevot
2015-05-19 17:58:45 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -1272,8 +1272,7 @@ public class SettingsActivity extends Activity
((UserManager) getSystemService(Context.USER_SERVICE))
.getUserCount() > 1;
if (!UserHandle.MU_ENABLED
|| (!UserManager.supportsMultipleUsers()
&& !hasMultipleUsers)
|| !UserManager.supportsMultipleUsers()
|| Utils.isMonkeyRunning()) {
removeTile = true;
}