diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-06-12 13:40:57 -0400 |
|---|---|---|
| committer | Julia Reynolds <juliacr@google.com> | 2014-06-12 13:40:57 -0400 |
| commit | b7fe475f26f62a2d6d846922a0ff3ea8f823d735 (patch) | |
| tree | 963b748e699b2b24f470e470d8816d011136162d | |
| parent | ddceb3264ca51c2e46a449264f5bc451705eb990 (diff) | |
| download | android_packages_apps_CertInstaller-b7fe475f26f62a2d6d846922a0ff3ea8f823d735.tar.gz android_packages_apps_CertInstaller-b7fe475f26f62a2d6d846922a0ff3ea8f823d735.tar.bz2 android_packages_apps_CertInstaller-b7fe475f26f62a2d6d846922a0ff3ea8f823d735.zip | |
Block certificate installation if user restriction enabled.
Bug: 14081992
Change-Id: Ic7f04cc3555144512ca100b31d77ddec15e28546
| -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 c83e99f..ec9a55a 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; @@ -57,6 +59,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(); |