Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: c9db16c

* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
This commit is contained in:
Robin Lee
2014-12-28 05:36:20 +00:00
committed by android-build-merger
parent 4ac5f68b56 c9db16c591
commit b6b7d4251c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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;