Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user