diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-06-19 12:48:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-17 21:13:21 +0000 |
| commit | 19d80c1b3e5410202e94884db0a76fc8f9574c57 (patch) | |
| tree | 4f06575599974219c15dcb6e35a266f984815e91 | |
| parent | 38a956408f45c9a7cbb48b79c67257b9207fda30 (diff) | |
| parent | b7fe475f26f62a2d6d846922a0ff3ea8f823d735 (diff) | |
| download | android_packages_apps_CertInstaller-19d80c1b3e5410202e94884db0a76fc8f9574c57.tar.gz android_packages_apps_CertInstaller-19d80c1b3e5410202e94884db0a76fc8f9574c57.tar.bz2 android_packages_apps_CertInstaller-19d80c1b3e5410202e94884db0a76fc8f9574c57.zip | |
Merge "Block certificate installation if user restriction enabled."
| -rw-r--r-- | src/com/android/certinstaller/CertInstallerMain.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java index 9adeb7c..e184ae6 100644 --- a/src/com/android/certinstaller/CertInstallerMain.java +++ b/src/com/android/certinstaller/CertInstallerMain.java @@ -16,9 +16,11 @@ package com.android.certinstaller; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.os.UserManager; import android.preference.PreferenceActivity; import android.provider.DocumentsContract; import android.security.Credentials; @@ -59,6 +61,12 @@ public class CertInstallerMain extends PreferenceActivity { setResult(RESULT_CANCELED); + UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE); + if (userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) { + finish(); + return; + } + final Intent intent = getIntent(); final String action = intent.getAction(); |