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:37:07 -0700
commit8823287fa10d30e3ebacf4a60befbef2a8cdef31 (patch)
tree94182c6df0da0806361bd78b2689936e8af015ca
parentf1b6d8132706c1bef8fd5e238df6ff92fa8b2ff9 (diff)
downloadandroid_packages_apps_CertInstaller-8823287fa10d30e3ebacf4a60befbef2a8cdef31.tar.gz
android_packages_apps_CertInstaller-8823287fa10d30e3ebacf4a60befbef2a8cdef31.tar.bz2
android_packages_apps_CertInstaller-8823287fa10d30e3ebacf4a60befbef2a8cdef31.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. (cherry picked from commit 89f8f9ab58947ba67f95c5784dc4288bf78a2fdf) Bug: 7249554 Change-Id: I05e8804e35d762ad473d1649fdba34e4182a2c68
-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;