summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-12-22 11:48:10 +0000
committerRobin Lee <rgl@google.com>2014-12-22 13:22:11 +0000
commit853964927c12926321911081217c5f0742e7e82a (patch)
treee3d4e7e5f2e2ea96d876a7a9dc88fb1a14523a03 /services/devicepolicy/java
parent80559f4aadb3419eecdf6bf61945af584cd2aa8a (diff)
downloadframeworks_base-853964927c12926321911081217c5f0742e7e82a.zip
frameworks_base-853964927c12926321911081217c5f0742e7e82a.tar.gz
frameworks_base-853964927c12926321911081217c5f0742e7e82a.tar.bz2
Revert "DevicePolicy: Don't warn about managed profile CAs"
This reverts commit 80559f4aadb3419eecdf6bf61945af584cd2aa8a. Bug: 18224038 Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
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 b0d87e9..1649285 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1644,15 +1644,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;