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

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

Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 

am: 090b5a8e

* commit '090b5a8e':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: I2e9640afda015a27c8ba8e829a19fba38f4de69f
parents 9580593e 090b5a8e

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

+6 −3
Original line number Diff line number Diff line
@@ -2701,10 +2701,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            // Build and show a warning notification

            int smallIconId;

            String contentText;

            int parentUserId = userHandle.getIdentifier();

            if (getProfileOwner(userHandle.getIdentifier()) != null) {

                contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed,

                        getProfileOwnerName(userHandle.getIdentifier()));

                smallIconId = R.drawable.stat_sys_certificate_info;

                parentUserId = getProfileParentId(userHandle.getIdentifier());

            } else if (getDeviceOwnerUserId() == userHandle.getIdentifier()) {

                contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed,

                        getDeviceOwnerName());
@@ -2716,12 +2718,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


            final int numberOfCertificates = pendingCertificates.size();

            Intent dialogIntent = new Intent(Settings.ACTION_MONITORING_CERT_INFO);

            dialogIntent.setFlags(

                    Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

            dialogIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

            dialogIntent.setPackage("com.android.settings");

            dialogIntent.putExtra(Settings.EXTRA_NUMBER_OF_CERTIFICATES, numberOfCertificates);

            dialogIntent.putExtra(Intent.EXTRA_USER_ID, userHandle.getIdentifier());

            PendingIntent notifyIntent = PendingIntent.getActivityAsUser(mContext, 0,

                    dialogIntent, PendingIntent.FLAG_UPDATE_CURRENT, null, userHandle);

                    dialogIntent, PendingIntent.FLAG_UPDATE_CURRENT, null,

                    new UserHandle(parentUserId));



            final Context userContext;

            try {