summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-12-23 12:30:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-23 12:30:28 +0000
commitb4b14e391dbcde537350ccf649b3603cafba1e6c (patch)
tree7c228223d8145f79339aad9409232e5248157c4a /services/devicepolicy/java
parent83a590b14ca70da7b6061529a521212572d732b3 (diff)
parent853964927c12926321911081217c5f0742e7e82a (diff)
downloadframeworks_base-b4b14e391dbcde537350ccf649b3603cafba1e6c.zip
frameworks_base-b4b14e391dbcde537350ccf649b3603cafba1e6c.tar.gz
frameworks_base-b4b14e391dbcde537350ccf649b3603cafba1e6c.tar.bz2
Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev
Diffstat (limited to 'services/devicepolicy/java')
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 72a3337..5e405ce 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1662,15 +1662,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
private void manageNotification(UserHandle userHandle) {
- final UserInfo userInfo = mUserManager.getUserInfo(userHandle.getIdentifier());
-
- // Inactive users or managed profiles shouldn't provoke a warning
if (!mUserManager.isUserRunning(userHandle)) {
return;
}
- if (userInfo == null || userInfo.isManagedProfile()) {
- return;
- }
// Call out to KeyChain to check for user-added CAs
boolean hasCert = false;