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

Merge "Don't check for monitoring CA certs in cryptkeeper"

Browse Source
This commit is contained in:
Robin Lee
2017-01-03 18:43:48 +00:00
committed by Android (Google) Code Review
parent dc143e01cc a04a29ae02
commit f8ced7790a
1 changed files with 4 additions and 2 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

@@ -544,8 +544,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (Intent.ACTION_USER_UNLOCKED.equals(action)
|| Intent.ACTION_USER_STARTED.equals(action)
|| KeyChain.ACTION_TRUST_STORE_CHANGED.equals(action)) {
int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL);
new MonitoringCertNotificationTask().execute(userId);
if (!StorageManager.inCryptKeeperBounce()) {
new MonitoringCertNotificationTask().execute(
intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL));
}
}
if (Intent.ACTION_USER_ADDED.equals(action)) {
sendUserAddedOrRemovedCommand(DeviceAdminReceiver.ACTION_USER_ADDED, userHandle);