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

Commit a04a29ae authored by Robin Lee's avatar Robin Lee
Browse files

Don't check for monitoring CA certs in cryptkeeper 

Change-Id: I35dc031e4cd652a79174d03f6a9f02120f46abd2
Test: CtsVerifier (ca certificate test)
Fix: 33454899
parent 059a60b8

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

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