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

Allow multiuser use of keystore

Browse Source 
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit cc48b0104e)

Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
This commit is contained in:
Kenny Root
2013-04-08 09:56:05 -07:00
parent b26a61d643
commit c5550c2012
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.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.security.Credentials; import android.security.Credentials;
import android.security.KeyChain.KeyChainConnection; import android.security.KeyChain.KeyChainConnection;
import android.security.KeyChain; import android.security.KeyChain;
@@ -109,12 +108,6 @@ public final class CredentialStorage extends Activity {
protected void onResume() { protected void onResume() {
super.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(); Intent intent = getIntent();
String action = intent.getAction(); String action = intent.getAction();

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

@@ -234,8 +234,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
// Show password // Show password
mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD); mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
// Credential storage, only for primary user // Credential storage
if (mIsPrimary) {
mKeyStore = KeyStore.getInstance(); mKeyStore = KeyStore.getInstance();
Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE); Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
@@ -245,10 +244,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
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) PreferenceGroup deviceAdminCategory= (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY); root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
mToggleAppInstallation = (CheckBoxPreference) findPreference( mToggleAppInstallation = (CheckBoxPreference) findPreference(