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

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

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

parents dc143e01 a04a29ae

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -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);