diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-05-19 17:58:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 17:58:46 +0000 |
| commit | e74fdb8d672a361f5a29cded65278054e1683fc6 (patch) | |
| tree | e13fe0fdfa7d7b9fb661352f973e2d4bab62096d /src/com/android/settings/SettingsActivity.java | |
| parent | 2b7685224d1021a9e163a2ffc4bf4e8d38b56252 (diff) | |
| parent | 36940543e98c96413168d094914810ce3ccc424f (diff) | |
| download | packages_apps_Settings-e74fdb8d672a361f5a29cded65278054e1683fc6.zip packages_apps_Settings-e74fdb8d672a361f5a29cded65278054e1683fc6.tar.gz packages_apps_Settings-e74fdb8d672a361f5a29cded65278054e1683fc6.tar.bz2 | |
Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 7ce581f..c256f5c 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -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; } |