diff options
author | Amith Yamasani <yamasani@google.com> | 2014-03-26 14:46:47 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2014-03-26 14:46:47 -0700 |
commit | cfb8d7f3c87019db6970c44215b9ee0dfca310eb (patch) | |
tree | cf74b9550f91e3b4bd78fced5dfd7b42e0cc31d0 | |
parent | 52da9af0926b6a7622a1f9cc91fd96d459cfc8ad (diff) | |
download | packages_apps_Settings-cfb8d7f3c87019db6970c44215b9ee0dfca310eb.zip packages_apps_Settings-cfb8d7f3c87019db6970c44215b9ee0dfca310eb.tar.gz packages_apps_Settings-cfb8d7f3c87019db6970c44215b9ee0dfca310eb.tar.bz2 |
Don't allow user creation on phones via Settings search
This screen was blocked from appearing in the main Settings list, but
search now exposes it.
Disable content on the Users screen if multiple users are not supported
on the device. This is a temporary fix until Settings search does the
right thing.
Bug: 13631986
Change-Id: Icc61d3e9ce4e405d0cf8841af538216be59fac26
-rw-r--r-- | src/com/android/settings/users/UserSettings.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 1a60e78..84fee3e 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -128,6 +128,7 @@ public class UserSettings extends RestrictedSettingsFragment private int mAddedUserId = 0; private boolean mAddingUser; private boolean mProfileExists; + private boolean mEnabled = true; private final Object mUserLock = new Object(); private UserManager mUserManager; @@ -184,6 +185,10 @@ public class UserSettings extends RestrictedSettingsFragment } mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); + if (!mUserManager.supportsMultipleUsers() || Utils.isMonkeyRunning()) { + mEnabled = false; + return; + } addPreferencesFromResource(R.xml.user_settings); mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST); mMePreference = new UserPreference(getActivity(), null, UserHandle.myUserId(), @@ -209,6 +214,9 @@ public class UserSettings extends RestrictedSettingsFragment @Override public void onResume() { super.onResume(); + + if (!mEnabled) return; + loadProfile(); updateUserList(); } @@ -216,6 +224,9 @@ public class UserSettings extends RestrictedSettingsFragment @Override public void onDestroy() { super.onDestroy(); + + if (!mEnabled) return; + getActivity().unregisterReceiver(mUserChangeReceiver); } |