am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c

automerge: b6b7d42

* commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e':
  Revert "DevicePolicy: Don't warn about managed profile CAs"

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 c033a9a..2f0525a 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1663,15 +1663,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;