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

Commit b3e08e03 authored by Victor Chang's avatar Victor Chang Committed by android-build-merger
Browse files

Merge "Fix Certificate authority installed notification is gone when turning... 

Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
am: 7c527bf7

* commit '7c527bf7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: I49885b9bffb4c16f52f7ed471b1019dfb7fe85f4
parents 4a3b323d 7c527bf7

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

+3 −1
Original line number Diff line number Diff line
@@ -484,7 +484,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    }

                });

            }

            if (Intent.ACTION_BOOT_COMPLETED.equals(action)

            if (Intent.ACTION_USER_UNLOCKED.equals(action)

                    || Intent.ACTION_USER_STARTED.equals(action)

                    || KeyChain.ACTION_STORAGE_CHANGED.equals(action)) {

                int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL);

                new MonitoringCertNotificationTask().execute(userId);
@@ -1582,6 +1583,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        filter.addAction(Intent.ACTION_USER_ADDED);

        filter.addAction(Intent.ACTION_USER_REMOVED);

        filter.addAction(Intent.ACTION_USER_STARTED);

        filter.addAction(Intent.ACTION_USER_UNLOCKED);

        filter.addAction(KeyChain.ACTION_STORAGE_CHANGED);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        mContext.registerReceiverAsUser(mReceiver, UserHandle.ALL, filter, null, mHandler);