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

Commit 19c7ef11 authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev

parents 102b3681 cba033e4

src/com/android/settings/MonitoringCertInfoActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe 


        if (dpm.getProfileOwnerAsUser(mUserId) != null) {

            builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,

                    numberOfCertificates, dpm.getProfileOwnerName()));

                    numberOfCertificates, dpm.getProfileOwnerNameAsUser(mUserId)));

        } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {

            builder.setMessage(getResources().getQuantityString(

                    R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,