diff options
| author | Kenny Root <kroot@google.com> | 2013-04-08 17:34:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-08 17:34:20 +0000 |
| commit | 048bb6c386ff614e9ad1294dc8e135b9f5922227 (patch) | |
| tree | 78b8a7d4aa126bdea4ffcd3b30d698f0507178a6 | |
| parent | a1008d4bfa1c934419013da0d2186f0fe6ce9327 (diff) | |
| parent | 89f8f9ab58947ba67f95c5784dc4288bf78a2fdf (diff) | |
| download | android_packages_apps_CertInstaller-048bb6c386ff614e9ad1294dc8e135b9f5922227.tar.gz android_packages_apps_CertInstaller-048bb6c386ff614e9ad1294dc8e135b9f5922227.tar.bz2 android_packages_apps_CertInstaller-048bb6c386ff614e9ad1294dc8e135b9f5922227.zip | |
Merge "Allow multiuser use of keystore"
| -rw-r--r-- | src/com/android/certinstaller/CertInstaller.java | 7 |
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; |