PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow multiuser use of keystore" into jb-mr2-dev

Browse Source
This commit is contained in:
Kenny Root
2013-04-08 17:58:37 +00:00
committed by Android (Google) Code Review
parent b8c4898c64 c5550c2012
commit 645e78d806
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/CredentialStorage.java
View File

@@ -25,7 +25,6 @@ import android.content.res.Resources;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
import android.security.Credentials;
import android.security.KeyChain.KeyChainConnection;
import android.security.KeyChain;
@@ -109,12 +108,6 @@ public final class CredentialStorage extends Activity {
protected void onResume() {
super.onResume();
if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
Log.i(TAG, "Cannot install to CredentialStorage as non-primary user");
finish();
return;
}
Intent intent = getIntent();
String action = intent.getAction();

21
src/com/android/settings/SecuritySettings.java
View File

@@ -234,21 +234,18 @@ public class SecuritySettings extends SettingsPreferenceFragment
// Show password
mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
// Credential storage, only for primary user
if (mIsPrimary) {
mKeyStore = KeyStore.getInstance();
Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
// Credential storage
mKeyStore = KeyStore.getInstance();
Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
final int storageSummaryRes =
mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
: R.string.credential_storage_type_software;
credentialStorageType.setSummary(storageSummaryRes);
final int storageSummaryRes =
mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
: R.string.credential_storage_type_software;
credentialStorageType.setSummary(storageSummaryRes);
mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
} else {
removePreference(KEY_CREDENTIALS_MANAGER);
}
mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
// Application install
PreferenceGroup deviceAdminCategory= (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
mToggleAppInstallation = (CheckBoxPreference) findPreference(