diff options
| author | Emily Bernier <ember@google.com> | 2013-04-11 16:24:56 -0400 |
|---|---|---|
| committer | Emily Bernier <ember@google.com> | 2013-04-11 19:54:57 -0400 |
| commit | 11bd33a564d4ae9a48195ad11dbbd09d80e59b55 (patch) | |
| tree | 03a0d8fd1c6804b2837a5d339801b3feaccf1b93 /src | |
| parent | 3c3fa0ccb8bf9f62558202e909cc158a2e673e37 (diff) | |
| download | packages_apps_Settings-11bd33a564d4ae9a48195ad11dbbd09d80e59b55.zip packages_apps_Settings-11bd33a564d4ae9a48195ad11dbbd09d80e59b55.tar.gz packages_apps_Settings-11bd33a564d4ae9a48195ad11dbbd09d80e59b55.tar.bz2 | |
User restrictions for creds storage & user removal
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 16 | ||||
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 556f548..c2ddb5f 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -235,15 +235,20 @@ public class SecuritySettings extends SettingsPreferenceFragment mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD); // Credential storage - mKeyStore = KeyStore.getInstance(); - Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE); + final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); + if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) { + mKeyStore = KeyStore.getInstance(); + Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE); - final int storageSummaryRes = + final int storageSummaryRes = mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware : R.string.credential_storage_type_software; - credentialStorageType.setSummary(storageSummaryRes); + credentialStorageType.setSummary(storageSummaryRes); - mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS); + mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS); + } else { + removePreference(KEY_CREDENTIALS_MANAGER); + } // Application install PreferenceGroup deviceAdminCategory= (PreferenceGroup) @@ -252,7 +257,6 @@ public class SecuritySettings extends SettingsPreferenceFragment KEY_TOGGLE_INSTALL_APPLICATIONS); mToggleAppInstallation.setChecked(isNonMarketAppsAllowed()); - final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); boolean isSideloadingAllowed = !um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES); // Side loading of apps. diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 5830184..01d041a 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -225,7 +225,8 @@ public class UserSettings extends SettingsPreferenceFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - if (!mIsOwner) { + UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); + if (!mIsOwner && !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) { String nickname = mUserManager.getUserName(); MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0, getResources().getString(R.string.user_remove_user_menu, nickname)); |