Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4b14e39 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev

parents 83a590b1 85396492
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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;