Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc48b010 authored by Kenny Root's avatar Kenny Root
Browse files

Allow multiuser use of keystore 

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

Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
parent 43366b2c

src/com/android/settings/CredentialStorage.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -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();

src/com/android/settings/SecuritySettings.java

+9 −12
Original line number Original line Diff line number Diff line
@@ -231,8 +231,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);
@@ -242,10 +241,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

        mToggleAppInstallation = (CheckBoxPreference) findPreference(

        mToggleAppInstallation = (CheckBoxPreference) findPreference(

                KEY_TOGGLE_INSTALL_APPLICATIONS);

                KEY_TOGGLE_INSTALL_APPLICATIONS);

        mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());

        mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());