summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-04-08 10:01:33 -0700
committerKenny Root <kroot@google.com>2013-04-08 10:23:28 -0700
commit89f8f9ab58947ba67f95c5784dc4288bf78a2fdf (patch)
tree78b8a7d4aa126bdea4ffcd3b30d698f0507178a6
parenta1008d4bfa1c934419013da0d2186f0fe6ce9327 (diff)
downloadandroid_packages_apps_CertInstaller-89f8f9ab58947ba67f95c5784dc4288bf78a2fdf.tar.gz
android_packages_apps_CertInstaller-89f8f9ab58947ba67f95c5784dc4288bf78a2fdf.tar.bz2
android_packages_apps_CertInstaller-89f8f9ab58947ba67f95c5784dc4288bf78a2fdf.zip
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: Ia4a9f8cdd2f86b458805505e01ba9767330287d8
-rw-r--r--src/com/android/certinstaller/CertInstaller.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java
index a95dcac..0bfa33b 100644
--- a/src/com/android/certinstaller/CertInstaller.java
+++ b/src/com/android/certinstaller/CertInstaller.java
@@ -25,7 +25,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.os.UserHandle;
import android.security.Credentials;
import android.security.KeyChain;
import android.security.KeyChain.KeyChainConnection;
@@ -85,12 +84,6 @@ public class CertInstaller extends Activity {
protected void onCreate(Bundle savedStates) {
super.onCreate(savedStates);
- if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
- toastErrorAndFinish(R.string.only_primary_user_allowed);
- finish();
- return;
- }
-
mCredentials = createCredentialHelper(getIntent());
mState = (savedStates == null) ? STATE_INIT : STATE_RUNNING;