commit 645e78d8063169fa59b69bdc83ac5a62840d3253
author Kenny Root <kroot@google.com> Mon Apr 08 17:58:37 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 08 17:58:37 2013 +0000
tree dc1168408862d7f2c2c12e663add8266e06c80a9
parent b8c4898c64c6e1a0e3d0a1de7c0116d80edb6e44
parent c5550c2012c505dfb27d9a8da8ecb4787f366283

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

src/com/android/settings/CredentialStorage.java

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 1444a73..48c24f7 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -25,7 +25,6 @@
 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 @@
     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();
 

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index d75d630..556f548 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -234,21 +234,18 @@
         // 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(